- Timestamp:
- Feb 15, 2011, 3:05:23 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/controllers/dbnp/query/AdvancedQueryController.groovy
r1512 r1524 153 153 } 154 154 155 // Determine the possible actions 155 // Determine the possible actions and build correct urls 156 156 def actions = determineActions(s, selectedIds ); 157 157 … … 478 478 479 479 // First check whether a search with the same criteria is already present 480 def previousSearch = retrieveSearchByCriteria( s.getCriteria() );480 def previousSearch = retrieveSearchByCriteria( s.getCriteria(), s.searchMode ); 481 481 482 482 def id … … 499 499 * @return Search that has this criteria, or null if no such search is found. 500 500 */ 501 protected Search retrieveSearchByCriteria( List criteria ) {501 protected Search retrieveSearchByCriteria( List criteria, SearchMode searchMode = SearchMode.and ) { 502 502 if( !session.queries ) 503 503 return null … … 510 510 def value = query.value; 511 511 512 if( value. criteria && value.criteria.containsAll( criteria ) && criteria.containsAll( value.criteria ) ) {512 if( value.searchMode == searchMode && value.criteria && value.criteria.containsAll( criteria ) && criteria.containsAll( value.criteria ) ) { 513 513 return value; 514 514 }
Note: See TracChangeset
for help on using the changeset viewer.