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

Timestamp:

Feb 10, 2011, 1:04:32 PM (12 years ago)

Author:

robert@…

Message:

Improved query views

File:

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

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

@@ -4 +4 @@
 import org.dbnp.gdt.*
 
-// TODO: Make use of the searchable-plugin possibilities instead of querying the database directly
+// TODO: Make use of the searchable-plugin or Lucene possibilities instead of querying the database directly
 
 /**
@@ -113 +113 @@
                         redirect( action: "index" );
                         return;
+                }
+                
+                // Attach all objects to the current hibernate thread, because the
+                // object might be attached to an old thread, since the results are
+                // saved in session
+                s.getResults().each {
+                        it.attach();
                 }
 
@@ -613 +620 @@
                                 if( json[ s.entity ] ) {
                                         json[ s.entity ].each { action ->
-                                                def url = module.url + "/action/" + action.name
-                                                url += "?entity=" + s.entity
+                                                def url = action.url ?: module.url + "/action/" + action.name
+                                                
+                                                if( url.find( /\?/ ) )
+                                                        url += "&"
+                                                else
+                                                        url += "?"
+                                                
+                                                url += "entity=" + s.entity
                                                 url += "&" + s.filterResults(selectedIds).collect { "tokens=" + it.giveUUID() }.join( "&" )
                                                 actions << [