Changeset 435 for trunk/grails-app/controllers

Timestamp:

Mar 8, 2010, 10:58:13 AM (15 years ago)

Author:

gav

Message:

Change InventoryItem to have a preferred and many alternate suppliers and manufacturers.
Controllers and views updated.

File:

• trunk/grails-app/controllers/InventoryItemDetailedController.groovy (modified) (3 diffs)

trunk/grails-app/controllers/InventoryItemDetailedController.groovy

@@ -240 +240 @@
         if(!result.error) {
             def possibleAlternateItems = inventoryItemService.getPossibleAlternateItems(result.inventoryItemInstance)
-            return [ inventoryItemInstance : result.inventoryItemInstance, possibleAlternateItems: possibleAlternateItems]
+            def suppliers = Supplier.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+            def manufacturers = Manufacturer.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+
+            return [ inventoryItemInstance : result.inventoryItemInstance,
+                            possibleAlternateItems: possibleAlternateItems,
+                            suppliers: suppliers,
+                            manufacturers: manufacturers]
         }
 
@@ -263 +269 @@
 
         def possibleAlternateItems = inventoryItemService.getPossibleAlternateItems(result.inventoryItemInstance)
-        render(view:'edit', model:[inventoryItemInstance: result.inventoryItemInstance.attach(), possibleAlternateItems: possibleAlternateItems])
+        def suppliers = Supplier.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+        def manufacturers = Manufacturer.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+        render(view:'edit', model:[inventoryItemInstance: result.inventoryItemInstance.attach(),
+                                                possibleAlternateItems: possibleAlternateItems,
+                                                suppliers: suppliers,
+                                                manufacturers: manufacturers])
     }
 
     def create = {
         def result = inventoryItemService.create(params)
+        def suppliers = Supplier.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+        def manufacturers = Manufacturer.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
 
         if(!result.error)
-            return [inventoryItemInstance: result.inventoryItemInstance]
+            return [inventoryItemInstance: result.inventoryItemInstance,
+                            suppliers: suppliers,
+                            manufacturers: manufacturers]
 
         //flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
@@ -285 +300 @@
         }
 
+        def suppliers = Supplier.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+        def manufacturers = Manufacturer.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+
         //flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
-        render(view:'create', model:[inventoryItemInstance: result.inventoryItemInstance])
+        render(view:'create', model:[inventoryItemInstance: result.inventoryItemInstance,
+                                                    suppliers: suppliers,
+                                                    manufacturers: manufacturers])
     }