Changeset 647 for trunk

Timestamp:

Sep 6, 2010, 4:07:45 AM (14 years ago)

Author:

gav

Message:

Add inventory reorder search, part 2.

Location:

trunk/grails-app

Files:

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

trunk/grails-app/controllers/InventoryItemDetailedController.groovy

@@ -576 +576 @@
         def suppliers = Supplier.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
         def inventoryGroups = InventoryGroup.findAllByIsActive(true)
-        if(!params.selectedGroups)
-            params.selectedGroups = inventoryGroups.collect{it.id}
+
+        if(params.selectedGroups) {
+            if(params.selectedGroups instanceof String)
+                params.selectedGroups = [params.selectedGroups.toLong()]
+            else
+                params.selectedGroups = params.selectedGroups.collect { it.toLong() }
+        }
         else
-            params.selectedGroups = params.selectedGroups.collect { it.toLong() }
+                params.selectedGroups = []
 
         // Restore search unless a new search is being requested.

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

@@ -39 +39 @@
                                                                             optionKey="id"
                                                                             sortBy="name"
-                                                                            height="80px"/>
+                                                                            height="120px"/>
                                         </td>
                                     </tr>