Changeset 1717 for trunk/grails-app

Timestamp:

Apr 6, 2011, 5:24:14 PM (10 years ago)

Author:

robert@…

Message:

Implemented searching for 'any field' in advanced query

Location:

trunk/grails-app

Files:

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

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

@@ -322 +322 @@
                                 def templateFields = TemplateField.findAllByEntity( entity )
 
-                                def fieldNames = ( domainFields + templateFields ).collect { it.name }.unique() + 'Template'
-
-                                fields[ it ] = fieldNames.sort { a, b -> a[0].toUpperCase() + a[1..-1] <=> b[0].toUpperCase() + b[1..-1] };
+                                def fieldNames = ( domainFields + templateFields ).collect { it.name }.unique() + 'Template' + '*'
+
+                                fields[ it ] = fieldNames.sort { a, b ->
+                                        def aUC = a.size() > 1 ? a[0].toUpperCase() + a[1..-1] : a;
+                                        def bUC = b.size() > 1 ? b[0].toUpperCase() + b[1..-1] : b;
+                                        aUC <=> bUC 
+                                };
                         }
                 }
@@ -346 +350 @@
                                 def moduleName = module.name.replace( 'module', '' ).trim()
 
-                                fields[ moduleName ] = moduleFields.unique();
+                                fields[ moduleName ] = moduleFields.unique() + '*';
                         } catch( Exception e ) {
                                 log.error( "Error while retrieving queryable fields from " + module.name + ": " + e.getMessage() )

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

@@ -5 +5 @@
                 <g:each in="${criteria}" var="criterion" status="j">
                         <li>
-                                <span class="entityfield">${criterion.entityField().toLowerCase()}</span>
+                                <span class="entityfield">${criterion.humanReadableEntityField().toLowerCase()}</span>
                                 <span class="operator">${criterion.operator}</span>
                                 <span class="value">

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

@@ -15 +15 @@
                                         <g:if test="${j > 0}">,</g:if>
                                         {
-                                                label: "${entity.key.toString().encodeAsJavaScript()}.${field.toString().encodeAsJavaScript()} ${entity.key.toString().encodeAsJavaScript()} ${field.toString().encodeAsJavaScript()}",
-                                                show: "${(field[0].toUpperCase() + field[1..-1]).encodeAsJavaScript()}",
+                                                label: "${(
+                                                        entity.key.toString() + '.' + field.toString() + ' ' +
+                                                        entity.key.toString() + ' ' + field.toString() + ' ' + 
+                                                        (field == '*' ? 'any field' : '')
+                                                        ).encodeAsJavaScript()}",
+                                                show: "${
+                                                        (field == '*' ? 
+                                                                '[Any field in ' + entity.key.toString() + ']' : 
+                                                                (field?.size() > 1 ? 
+                                                                        field[0].toUpperCase() + field[1..-1] : 
+                                                                        field)
+                                                        ).encodeAsJavaScript()}",
                                                 value: "${entity.key.toString().encodeAsJavaScript()}.${field.toString().encodeAsJavaScript()}",
                                                 entity: "${entity.key.toString().encodeAsJavaScript()}"
@@ -78 +88 @@
                                                                 <g:each in="${entity.value}" var="field">
                                                                         <option value="${entity.key}.${field}">
-                                                                                ${field[0].toUpperCase() + field[1..-1]}
+                                                                                <g:if test="${field?.size() > 1}">
+                                                                                        ${field[0].toUpperCase() + field[1..-1]}
+                                                                                </g:if>
+                                                                                <g:else>
+                                                                                        ${field}
+                                                                                </g:else>
                                                                         </option>
                                                                 </g:each>