Changeset 1524 for trunk/grails-app/controllers/dbnp/query/AdvancedQueryController.groovy

Timestamp:

Feb 15, 2011, 3:05:23 PM (12 years ago)

Author:

robert@…

Message:

Refactored some of the querying stuff and built in 'check all' checkboxes

File:

• trunk/grails-app/controllers/dbnp/query/AdvancedQueryController.groovy (modified) (4 diffs)

trunk/grails-app/controllers/dbnp/query/AdvancedQueryController.groovy

@@ -153 +153 @@
                 }
 
-                // Determine the possible actions
+                // Determine the possible actions and build correct urls
                 def actions = determineActions(s, selectedIds );
 
@@ -478 +478 @@
 
                 // First check whether a search with the same criteria is already present
-                def previousSearch = retrieveSearchByCriteria( s.getCriteria() );
+                def previousSearch = retrieveSearchByCriteria( s.getCriteria(), s.searchMode );
 
                 def id
@@ -499 +499 @@
          * @return                      Search that has this criteria, or null if no such search is found.
          */
-        protected Search retrieveSearchByCriteria( List criteria ) {
+        protected Search retrieveSearchByCriteria( List criteria, SearchMode searchMode = SearchMode.and ) {
                 if( !session.queries )
                         return null
@@ -510 +510 @@
                         def value = query.value;
 
-                        if( value.criteria && value.criteria.containsAll( criteria ) && criteria.containsAll( value.criteria ) ) {
+                        if( value.searchMode == searchMode && value.criteria && value.criteria.containsAll( criteria ) && criteria.containsAll( value.criteria ) ) {
                                 return value;
                         }