Changeset 616

Timestamp:

Jun 28, 2010, 1:01:30 AM (15 years ago)

Author:

gav

Message:

Domain change, rename InventoryItem property enableReorder to enableReorderListing as per ticket #75.

Location:

trunk/grails-app

Files:

• domain/InventoryItem.groovy (modified) (2 diffs)
• i18n/messages.properties (modified) (1 diff)
• services/InventoryCsvService.groovy (modified) (2 diffs)
• services/InventoryItemSearchService.groovy (modified) (1 diff)
• views/inventoryItemDetailed/create.gsp (modified) (1 diff)
• views/inventoryItemDetailed/edit.gsp (modified) (1 diff)
• views/inventoryItemDetailed/show.gsp (modified) (2 diffs)

trunk/grails-app/domain/InventoryItem.groovy

@@ -21 +21 @@
     boolean isActive = true
     boolean isObsolete = false
-    boolean enableReorder = true /// @todo: rename to enableReorderListing.
+    boolean enableReorderListing = true
 
     static mapping = {
@@ -45 +45 @@
         estimatedUnitPriceCurrency(nullable:true)
         reorderPoint()
-        enableReorder()
+        enableReorderListing()
         recommendedReorderPoint(nullable:true)
         isActive()

trunk/grails-app/i18n/messages.properties

@@ -370 +370 @@
 inventoryItem.search.text.none.found=No results for: {0}
 inventoryItem.search.text.below.reorder=Below Reorder
-inventoryItem.search.text.below.reorder.description=Inventory items at or below reorder point, with reorder enabled.
+inventoryItem.search.text.below.reorder.description=Inventory items at or below reorder point.
 inventoryItem.search.text.below.reorder.all=Below Reorder (all)
-inventoryItem.search.text.below.reorder.all.description=Inventory items at or below reorder point, including reorder disabled.
+inventoryItem.search.text.below.reorder.all.description=Inventory items at or below reorder point, including reorder listing disabled.
 inventoryItem.search.text.below.reorder.none.found=No inventory items found at or below reorder point.
 inventoryItem.search.text.all.description=All inventory items.

trunk/grails-app/services/InventoryCsvService.groovy

@@ -56 +56 @@
             def inventoryProperties = ["name", "description", "comment", "unitsInStock", "reorderPoint", "recommendedReorderPoint",
                                                         "unitOfMeasure", "estimatedUnitPriceAmount", "estimatedUnitPriceCurrency",
-                                                        "enableReorder", "inventoryLocation", "inventoryStore", "site",
+                                                        "enableReorderListing", "inventoryLocation", "inventoryStore", "site",
                                                         "inventoryGroup", "inventoryType", "averageDeliveryTime", "averageDeliveryPeriod",
                                                         "suppliersPartNumber", "preferredSupplier", "alternateSuppliers",
@@ -578 +578 @@
             row.add(inventoryItem.estimatedUnitPriceAmount)
             row.add(inventoryItem.estimatedUnitPriceCurrency)
-            row.add(inventoryItem.enableReorder)
+            row.add(inventoryItem.enableReorderListing)
             row.add(inventoryItem.inventoryLocation)
             row.add(inventoryItem.inventoryLocation.inventoryStore)

trunk/grails-app/services/InventoryItemSearchService.groovy

@@ -100 +100 @@
                 eq("isActive", true)
                 if(onlyReorderEnabled)
-                    eq("enableReorder", true)
+                    eq("enableReorderListing", true)
                 leProperty("unitsInStock", "reorderPoint")
             } // createCriteria

trunk/grails-app/views/inventoryItemDetailed/create.gsp

@@ -84 +84 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="enableReorder">Enable Reorder Listing:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'enableReorder','errors')}">
-                                    <g:checkBox name="enableReorder" value="${inventoryItemInstance?.enableReorder}" ></g:checkBox>
+                                    <label for="enableReorderListing">Enable Reorder Listing:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'enableReorderListing','errors')}">
+                                    <g:checkBox name="enableReorderListing" value="${inventoryItemInstance?.enableReorderListing}" ></g:checkBox>
                                 </td>
                             </tr>

trunk/grails-app/views/inventoryItemDetailed/edit.gsp

@@ -129 +129 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="enableReorder">Enable Reorder Listing:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'enableReorder','errors')}">
-                                    <g:checkBox name="enableReorder" value="${inventoryItemInstance?.enableReorder}" ></g:checkBox>
+                                    <label for="enableReorderListing">Enable Reorder Listing:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryItemInstance,field:'enableReorderListing','errors')}">
+                                    <g:checkBox name="enableReorderListing" value="${inventoryItemInstance?.enableReorderListing}" ></g:checkBox>
                                 </td>
                             </tr>

trunk/grails-app/views/inventoryItemDetailed/show.gsp

@@ -28 +28 @@
                 </div>
             </g:if>
-            <g:if test="${!inventoryItemInstance.enableReorder}" >
+            <g:if test="${!inventoryItemInstance.enableReorderListing}" >
                 <div class="message">
                     <g:message code="inventory.item.reorder.listing.disabled" />
@@ -253 +253 @@
                                     <tr class="prop">
                                         <td valign="top" class="name">Enable Reorder Listing:</td>
-                                        <td valign="top" class="value">${fieldValue(bean:inventoryItemInstance, field:'enableReorder')}</td>
+                                        <td valign="top" class="value">${fieldValue(bean:inventoryItemInstance, field:'enableReorderListing')}</td>
                                     </tr>