Refs #81 - changes copied from master branch commit 8a08c2b

cbmarcum · Oct 26, 2019 · 55bf54e · 55bf54e
1 parent 960c065
commit 55bf54e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/grails-app/domain/net/codebuilders/mybusiness/ProductCategory.groovy b/grails-app/domain/net/codebuilders/mybusiness/ProductCategory.groovy
@@ -50,7 +50,7 @@ class ProductCategory {
 
     // formatted for use in form select fields
     String toString() {
-        return "${description} < ${parent?.description ?: 'No Parent'} - id:${id}"
+        return "${description} - id:${id} > ${parent?.description ?: 'No Parent'}"
     }
 
 }
diff --git a/grails-app/services/net/codebuilders/mybusiness/ImportSheetService.groovy b/grails-app/services/net/codebuilders/mybusiness/ImportSheetService.groovy
@@ -576,7 +576,7 @@ class ImportSheetService {
                     // not in db yet
                     pc = new ProductCategory([description: desc, parent: pcParent])
                 } else {
-                    pc = ProductFeature.get(pcId)
+                    pc = ProductCategory.get(pcId)
                     pc.description = desc
                     pc.parent = pcParent
                 }
@@ -699,7 +699,7 @@ class ImportSheetService {
                                        title: title,
                                        photo: mf])
                 } else {
-                    photo = ProductFeature.get(photoId)
+                    photo = Photo.get(photoId)
                     photo.name = name
                     photo.alt = alt
                     photo.title = title

diff --git a/grails-app/views/product/show.gsp b/grails-app/views/product/show.gsp
@@ -35,10 +35,10 @@
             <dd><f:display bean="product" property="shortDescription"/></dd>
 
             <dt><g:message code="product.longDescription.label" default="Long Description"/></dt>
-            <dd><f:display bean="product" property="longDescription"/></dd>
+            <dd>${product?.longDescription.encodeAsRaw()}</dd>
 
             <dt><g:message code="product.largeDescription.label" default="Large Description"/></dt>
-            <dd><f:display bean="product" property="largeDescription"/></dd>
+            <dd>${product?.largeDescription.encodeAsRaw()}</dd>
 
             <dt><g:message code="product.conditionDescription.label" default="Condition Description"/></dt>
             <dd><f:display bean="product" property="conditionDescription"/></dd>
@@ -148,7 +148,7 @@
         <table class="table">
 
             <tbody>
-            <g:each in="${product.photos}" var="photo">
+            <g:each in="${product?.photos}" var="photo">
                 <tr>
                     <td>
                         <cb:image image="${photo.photo.getCloudFile('thumb')}"/><br/>