Changeset 956 for trunk

Timestamp:

Jun 30, 2011, 7:04:14 AM (13 years ago)

Author:

gav

Message:

Fix person list filterpane memory bug on associated properties.

Location:

trunk/grails-app

Files:

• controllers/PersonController.groovy (modified) (1 diff)
• views/person/list.gsp (modified) (2 diffs)

trunk/grails-app/controllers/PersonController.groovy

@@ -53 +53 @@
     def list = {
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100 )
+        def associatedPropertyMax = 1000
+        def associatedPropertyValues = [:]
+        def personGroupNameQuery = 'select distinct a.name from PersonGroup a where a.isActive = ? order by a.name'
+        associatedPropertyValues.personGroupList = PersonGroup.executeQuery(personGroupNameQuery, [true], [max:associatedPropertyMax])
+
+        def authorityQuery = 'select a.authority from Authority a'
+        associatedPropertyValues.authorityList = Authority.executeQuery(authorityQuery, [max:associatedPropertyMax])
 
         if(!params.filter) {
             return [personList: Person.list(params),
-                            personTotal: Person.count(),
-                            filterParams: params]
+                    personTotal: Person.count(),
+                    associatedPropertyValues: associatedPropertyValues,
+                    filterParams: params]
         }
 
         // filterPane:
         return[ personList: filterService.filter( params, Person ),
-            personTotal: filterService.count( params, Person ),
-            filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params),
-            params:params ]
+                personTotal: filterService.count( params, Person ),
+                associatedPropertyValues: associatedPropertyValues,
+                filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params),
+                params:params ]
     }
 

trunk/grails-app/views/person/list.gsp

@@ -13 +13 @@
 
     <div class="body">
-        <g:if test="${flash.message}">
-        <div class="message">${flash.message}</div>
-        </g:if>
+        <g:render template="/shared/messages" />
+
         <filterpane:currentCriteria domainBean="Person"
                                 action="list"
                                 dateFormat="EEE, dd-MMM-yyyy"
-                                removeImgDir="images" 
+                                removeImgDir="images"
                                 removeImgFile="bullet_delete.png"
                                 title="Search"/>
@@ -121 +120 @@
 
         <filterpane:filterPane domainBean="Person"
-                                title="Search"
-                                action="list"
-                                class="overlayPane"
-                                excludeProperties="password, sessionTimeout"
-                                associatedProperties="authorities.authority, personGroups.name"
-                                    filterPropertyValues="${['personGroups.name':[values:PersonGroup.list()],
-                                                                                'authorities.authority':[values:Authority.list()]]}" />
+                               title="Search"
+                               action="list"
+                               class="overlayPane"
+                               excludeProperties="password, sessionTimeout"
+                               associatedProperties="authorities.authority, personGroups.name"
+                               filterPropertyValues="${['personGroups.name':[values: associatedPropertyValues.personGroupList],
+                                                        'authorities.authority':[values: associatedPropertyValues.authorityList]]}" />