Changeset 554 for trunk

Timestamp:

May 31, 2010, 4:48:53 PM (14 years ago)

Author:

gav

Message:

Get Inventory Search filterpane associatedPropertyValues in controller instead of in gsp.

Location:

trunk/grails-app

Files:

• controllers/InventoryItemDetailedController.groovy (modified) (1 diff)
• controllers/TaskDetailedController.groovy (modified) (1 diff)
• views/inventoryItemDetailed/search.gsp (modified) (1 diff)

trunk/grails-app/controllers/InventoryItemDetailedController.groovy

@@ -235 +235 @@
         filterParams.order = params.order ?: "asc"
 
+        // Get some associatedProperty values for filterpane.
+        def associatedPropertyValues = [:]
+        def associatedPropertyMax = 10000
+        associatedPropertyValues.inventoryLocationList = InventoryLocation.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
+        associatedPropertyValues.assetList = Asset.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
+        associatedPropertyValues.manufacturerList = Manufacturer.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
+        associatedPropertyValues.supplierList = Supplier.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
+
         return[ inventoryItemInstanceList: inventoryItemInstanceList,
-                inventoryItemInstanceTotal: inventoryItemInstanceTotal,
-                filterParams: filterParams,
-                params: params ]
+                        inventoryItemInstanceTotal: inventoryItemInstanceTotal,
+                        filterParams: filterParams,
+                        params: params,
+                        associatedPropertyValues: associatedPropertyValues ]
     } // end search()
 

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -169 +169 @@
                         filterParams: filterParams,
                         params: params,
-                        associatedPropertyValues: associatedPropertyValues]
+                        associatedPropertyValues: associatedPropertyValues ]
 
     } // search

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

@@ -187 +187 @@
                                                                             preferredManufacturer.name,
                                                                             preferredSupplier.name"
-                                    filterPropertyValues="${['inventoryLocation.name':[values:InventoryLocation.findAllByIsActive(true, [max:10000, sort:'name'])],
-                                                                                'spareFor.name':[values:Asset.findAllByIsActive(true, [max:10000, sort:'name'])],
-                                                                                'preferredManufacturer.name':[values:Manufacturer.findAllByIsActive(true, [max:10000, sort:'name'])],
-                                                                                'preferredSupplier.name':[values:Supplier.findAllByIsActive(true, [max:10000, sort:'name'])],
+                                    filterPropertyValues="${['inventoryLocation.name':[values: associatedPropertyValues.inventoryLocationList],
+                                                                                'spareFor.name':[values: associatedPropertyValues.assetList],
+                                                                                'preferredManufacturer.name':[values: associatedPropertyValues.manufacturerList],
+                                                                                'preferredSupplier.name':[values: associatedPropertyValues.supplierList]
                                                                                 ]}"/>
         </div> <!-- end body div -->