Changeset 1913 for trunk/grails-app

Timestamp:

Jun 6, 2011, 2:47:23 PM (9 years ago)

Author:

robert@…

Message:

Fixed a bug in wildcard searches: now the system also searches through domain fields, instead of only looking in template fields

File:

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

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

@@ -494 +494 @@
                 
                 if( !s.url )
-                        s.url = g.createLink( controller: "advancedQuery", action: "show", id: id );
+                        s.url = g.createLink( controller: "advancedQuery", action: "show", id: id, absolute: true );
                 
                 session.queries[ id ] = s;
@@ -656 +656 @@
                                                 def paramString = s.filterResults(selectedTokens).collect { "tokens=" + it.giveUUID() }.join( "&" )
                                                 
-                                                if( baseUrl.find( /\?/ ) )
-                                                        baseUrl += "&"
+                                                def url = baseUrl;
+
+                                                if( url.find( /\?/ ) )
+                                                        url += "&"
                                                 else
-                                                        baseUrl += "?"
+                                                        url += "?"
                                                 
-                                                baseUrl += "entity=" + s.entity
-                                                
-                                                def url = baseUrl;
+                                                paramString += "&entity=" + s.entity
                                                 
                                                 actions << [