Index: /trunk/grails-app/controllers/AssetDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/AssetDetailedController.groovy (revision 155) +++ /trunk/grails-app/controllers/AssetDetailedController.groovy (revision 156) @@ -2,5 +2,7 @@ class AssetDetailedController extends BaseController { - + + def filterService + def index = { redirect(action:search,params:params) } @@ -15,5 +17,14 @@ 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 ] } Index: /trunk/grails-app/controllers/InventoryItemDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/InventoryItemDetailedController.groovy (revision 155) +++ /trunk/grails-app/controllers/InventoryItemDetailedController.groovy (revision 156) @@ -2,5 +2,7 @@ class InventoryItemDetailedController extends BaseController { - + + def filterService + def index = { redirect(action:search, params:params) } @@ -15,5 +17,14 @@ 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 ] } Index: /trunk/grails-app/views/assetDetailed/search.gsp =================================================================== --- /trunk/grails-app/views/assetDetailed/search.gsp (revision 155) +++ /trunk/grails-app/views/assetDetailed/search.gsp (revision 156) @@ -7,4 +7,5 @@ Asset Search + @@ -16,4 +17,16 @@
${flash.message}
+ + +
+ + Results:${assetInstanceTotal} +
+
@@ -21,13 +34,13 @@ - + - + - + - + - + @@ -61,7 +74,16 @@
- +
- + + + Index: /trunk/grails-app/views/inventoryItemDetailed/search.gsp =================================================================== --- /trunk/grails-app/views/inventoryItemDetailed/search.gsp (revision 155) +++ /trunk/grails-app/views/inventoryItemDetailed/search.gsp (revision 156) @@ -7,5 +7,5 @@ InventoryItem Search - + @@ -17,8 +17,16 @@
${flash.message}
- Search -
-
- + + +
+ + Results:${inventoryItemInstanceTotal} +
+
@@ -26,13 +34,13 @@ - + - + - + - + - + @@ -66,7 +74,13 @@
- +
- + + + Index: /trunk/grails-app/views/person/list.gsp =================================================================== --- /trunk/grails-app/views/person/list.gsp (revision 155) +++ /trunk/grails-app/views/person/list.gsp (revision 156) @@ -74,4 +74,4 @@ - +