Changeset 1800 for trunk/grails-app

Timestamp:

May 2, 2011, 5:03:36 PM (10 years ago)

Author:

robert@…

Message:

Implemented searching in 'all fields'

Location:

trunk/grails-app

Files:

• controllers/dbnp/query/AdvancedQueryController.groovy (modified) (3 diffs)
• views/advancedQuery/index.gsp (modified) (1 diff)

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

@@ -265 +265 @@
          */
         protected def getSearchableFields() {
-                def fields = [:];
+                def fields = [ '*' : [ '*' ] ]; // Searches for all fields in all objects
 
                 // Retrieve all local search fields
@@ -308 +308 @@
                         }
                 }
-
+                
                 return fields;
         }
@@ -332 +332 @@
                 ArrayList list = [];
                 flash.error = "";
+                
                 // Loop through all keys of c and remove the non-numeric ones
                 for( c in formCriteria ) {

trunk/grails-app/views/advancedQuery/index.gsp

@@ -18 +18 @@
                                                         entity.key.toString() + '.' + field.toString() + ' ' +
                                                         entity.key.toString() + ' ' + field.toString() + ' ' + 
-                                                        (field == '*' ? 'any field' : '')
+                                                        (field == '*' ? 'any field' : '') + ' ' +
+                                                        (field == '*' && entity.key == '*' ? 'any field in any object' : '')
                                                         ).encodeAsJavaScript()}",
                                                 show: "${
                                                         (field == '*' ? 
-                                                                '[Any field in ' + entity.key.toString() + ']' : 
+                                                                ( entity.key == '*' ? '[Any field in any object]' : '[Any field in ' + entity.key.toString() + ']' ) : 
                                                                 (field?.size() > 1 ? 
                                                                         field[0].toUpperCase() + field[1..-1] :