From ed9c2c446a15150e5888ac2dd86af83d8a66cbe3 Mon Sep 17 00:00:00 2001
From: cbmarcum <carl.marcum@codebuilders.net>
Date: Sat, 9 Nov 2019 10:06:21 -0500
Subject: [PATCH] Refs #81 - changed noImage to noImageLarge and added
 noImageSmall. only needed for this branch.

---
 .../mybusiness/ProductController.groovy       |   6 +-
 grails-app/views/product/index.gsp            | 131 +++++++++---------
 2 files changed, 72 insertions(+), 65 deletions(-)
diff --git a/grails-app/controllers/net/codebuilders/mybusiness/ProductController.groovy b/grails-app/controllers/net/codebuilders/mybusiness/ProductController.groovy
index 3dcba73..ca4ffb1 100644
--- a/grails-app/controllers/net/codebuilders/mybusiness/ProductController.groovy
+++ b/grails-app/controllers/net/codebuilders/mybusiness/ProductController.groovy
@@ -306,11 +306,13 @@ class ProductController {
         def notices = noticeService.getCurrentNoticesByPage("Product")
 
         // used for no-image if a product is missing one.
-        def noImage = Photo.findByName("no-image")?.photo?.getCloudFile("large")
+        def noImageLarge = Photo.findByName("no-image")?.photo?.getCloudFile("large")
+        def noImageSmall = Photo.findByName("no-image")?.photo?.getCloudFile("small")
         
         // render(view:'index', model: [message: 'Hello world', result: result, fieldsList: indexedProperties.keySet()])
 
-        respond productList, model: [productCategory: productCategory, productCount: productCount, noticeList: notices, noImage: noImage]
+        respond productList, model: [productCategory: productCategory, productCount: productCount, 
+            noticeList: notices, noImageLarge: noImageLarge, noImageSmall: noImageSmall]
 
     }
 
diff --git a/grails-app/views/product/index.gsp b/grails-app/views/product/index.gsp
index df9893f..ef7af3a 100644
--- a/grails-app/views/product/index.gsp
+++ b/grails-app/views/product/index.gsp
@@ -1,71 +1,76 @@
 <!doctype html>
 <html>
-<head>
-    <meta name="layout" content="main">
-    <g:set var="entityName" value="${message(code: 'product.label', default: 'Product')}"/>
-    <g:if test="${params.category}">
-        <g:set var="entityCategory" value="${params.category}"/>
-    </g:if>
-    <g:else>
-        <g:set var="entityCategory" value="All Products"/>
-    </g:else>
+    <head>
+        <meta name="layout" content="main">
+        <g:set var="entityName" value="${message(code: 'product.label', default: 'Product')}"/>
+        <g:if test="${params.category}">
+            <g:set var="entityCategory" value="${params.category}"/>
+        </g:if>
+        <g:else>
+            <g:set var="entityCategory" value="All Products"/>
+        </g:else>
 
-    <title><g:message code="default.list.label" args="[entityName]"/></title>
+        <title><g:message code="default.list.label" args="[entityName]"/></title>
 
-</head>
+    </head>
 
-<body>
+    <body>
 
-<div class="container">
+        <div class="container">
 
-    <a href="#list-product" class="skip" tabindex="-1"><g:message code="default.link.skip.label"
-                                                                  default="Skip to content&hellip;"/></a>
-    <sec:access expression="hasRole('ROLE_ADMIN')">
-        <g:render template="/common/subnav-create"/>
-    </sec:access>
+            <a href="#list-product" class="skip" tabindex="-1"><g:message code="default.link.skip.label"
+                    default="Skip to content&hellip;"/></a>
+            <sec:access expression="hasRole('ROLE_ADMIN')">
+                <g:render template="/common/subnav-create"/>
+            </sec:access>
 
 
-    <div id="list-product" class="row">
-        <div class="col-sm-6">
-            <h1><g:message code="default.list.label" args="[entityName]"/>&nbsp;<small>&nbsp;${entityCategory}</small>
-            </h1>
-        </div>
+            <div id="list-product" class="row">
+                <div class="col-sm-6">
+                    <h1><g:message code="default.list.label" args="[entityName]"/>&nbsp;<small>&nbsp;${entityCategory}</small>
+                    </h1>
+                </div>
 
-        <div class="col-sm-6">
-            <g:render template="/product/menubar-search"/>
-        </div>
+                <div class="col-sm-6">
+                    <g:render template="/product/menubar-search"/>
+                </div>
 
-    </div> <%-- /.row --%>
+            </div> <%-- /.row --%>
 
-    <g:render template="/common/flash-message"/>
+            <g:render template="/common/flash-message"/>
 
-    <g:render template="/common/notice-message"/>
+            <g:render template="/common/notice-message"/>
 
-    <div>Hover over image to zoom</div>
+            <div>Hover over image to zoom</div>
 
-    <div class="table-responsive">
-        <table class="table">
+            <div class="table-responsive">
+                <table class="table">
 
-            <tbody>
-            <g:each in="${productList}" status="i" var="product">
-                <g:set var="large" value="${product.photos[0].photo.getCloudFile("large")}"/>
-                <g:set var="small" value="${product.photos[0].photo.getCloudFile("small")}"/>
-
-                <tr>
-                    <td width="160px">
+                    <tbody>
+                        <g:each in="${productList}" status="i" var="product">
+                            <g:if test="${product.photos[0]}">
+                                <g:set var="large" value="${product.photos[0].photo.getCloudFile("large")}"/>
+                                <g:set var="small" value="${product.photos[0].photo.getCloudFile("small")}"/>
+                            </g:if>
+                            <g:else>
+                                <g:set var="large" value="${noImageLarge}"/>
+                                <g:set var="large" value="${noImageSmall}"/>
+                            </g:else>
+                            <tr>
+                                <td width="160px">
                         <cb:zoomImageByClass clazz="zoom_01" large="${large}" small="${small}"/>
-                    </td>
-                    <td>SKU:
+                        </td>
+                        <td>SKU:
                         <sec:access expression="hasRole('ROLE_ADMIN')">
                             <g:link action="show" id="${product.id}">${product.number}</g:link><br/>
-                        </sec:access>
-                        <sec:noAccess expression="hasRole('ROLE_ADMIN')">
+                            </sec:access>
+                            <sec:noAccess expression="hasRole('ROLE_ADMIN')">
                             <g:link action="detail" id="${product.id}">${product.number}</g:link><br/>
-                        </sec:noAccess>
-                        <b>${product?.name}</b><br/>
+                            </sec:noAccess>
+                            <b>${product?.name}</b><br/>
                         ${product?.shortDescription}<br/>
                         List Price: <g:formatNumber number="${product.listPrice}" type="currency"
-                                                    currencyCode="USD"/><br/>
+                            currencyCode="USD"/><br/>
 
                         <g:if test="${product.variantGroupId}">
                             <g:link action="detail" id="${product.id}">Product details and variations</g:link><br/>
@@ -75,30 +80,30 @@
                             <g:link action="detail" id="${product.id}">Product details</g:link><br/>
                         </g:else>
 
-                    </td>
+                        </td>
 
-                </tr>
-            </g:each>
-            </tbody>
-        </table>
-    </div><!-- table-responsive -->
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div><!-- table-responsive -->
 
 
-    <g:if test="${productCount > params.max}">
-        <div class="text-center">
-            <cb:bsPaginate total="${productCount}" params="${params}"/>
-        </div>
-    </g:if>
+            <g:if test="${productCount > params.max}">
+                <div class="text-center">
+                    <cb:bsPaginate total="${productCount}" params="${params}"/>
+                </div>
+        </g:if>
 
-</div> <!-- /.container -->
+    </div> <!-- /.container -->
 
-<script type="text/javascript">
-    //initiate the plugin and pass the class of the div containing gallery images
-    $(".zoom_01").elevateZoom({
+    <script type="text/javascript">
+        //initiate the plugin and pass the class of the div containing gallery images
+        $(".zoom_01").elevateZoom({
         zoomWindowWidth: 200,
         zoomWindowHeight: 200
-    });
-</script>
+        });
+    </script>
 
 </body>
 </html>
\ No newline at end of file

+
-	SKU: +	SKU: ${product.number} - - + + ${product.number} - - ${product?.name} + + ${product?.name} ${product?.shortDescription} List Price: + currencyCode="USD"/> Product details and variations @@ -75,30 +80,30 @@ Product details -