Changeset 156 for trunk/grails-app/controllers

Timestamp:

Oct 20, 2009, 5:55:50 PM (15 years ago)

Author:

gav

Message:

Add filterPane to Asset and Inventory search views.

Location:

trunk/grails-app/controllers

Files:

• AssetDetailedController.groovy (modified) (2 diffs)
• InventoryItemDetailedController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/AssetDetailedController.groovy

@@ -2 +2 @@
 
 class AssetDetailedController extends BaseController {
-    
+
+    def filterService
+
     def index = { redirect(action:search,params:params) }
 
@@ -15 +17 @@
     def search = {
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ assetInstanceList: Asset.list( params ), assetInstanceTotal: Asset.count() ]
+
+        // Quick Search:
+        if(!params.filter) {
+           return [ assetInstanceList: Asset.list( params ), assetInstanceTotal: Asset.count() ]
+        }
+        // filterPane:
+        return[ assetInstanceList: filterService.filter( params, Asset ),
+                assetInstanceTotal: filterService.count( params, Asset ),
+                filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params),
+                params:params ]
     }
 

trunk/grails-app/controllers/InventoryItemDetailedController.groovy

@@ -2 +2 @@
 
 class InventoryItemDetailedController extends BaseController {
-    
+
+    def filterService
+
     def index = { redirect(action:search, params:params) }
 
@@ -15 +17 @@
     def search = {
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ inventoryItemInstanceList: InventoryItem.list( params ), inventoryItemInstanceTotal: InventoryItem.count() ]
+
+        // Quick Search:
+        if(!params.filter) {
+            return[ inventoryItemInstanceList: InventoryItem.list( params ), inventoryItemInstanceTotal: InventoryItem.count() ]
+        }
+        // filterPane:
+        return[ inventoryItemInstanceList: filterService.filter( params, InventoryItem ),
+                inventoryItemInstanceTotal: filterService.count( params, InventoryItem ),
+                filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params),
+                params:params ]
     }