Changeset 1432

Timestamp:

Jan 22, 2011, 4:07:36 PM (12 years ago)

Author:

robert@…

Message:

Made querying aware of the templates being moved to a plugin. Also added imports of the plugin objects in some integration tests (see #225)

Location:

trunk

Files:

• grails-app/controllers/dbnp/query/AdvancedQueryController.groovy (modified) (1 diff)
• lib (modified) (1 prop)
• src/groovy/dbnp/query/SampleSearch.groovy (modified) (1 diff)
• test/integration/gscf/OntologyTests.groovy (modified) (1 diff)
• test/integration/gscf/SampleTests.groovy (modified) (1 diff)
• test/integration/gscf/SubjectTests.groovy (modified) (1 diff)

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

@@ -2 +2 @@
 
 import dbnp.studycapturing.*
+import nl.grails.plugins.gdt.*
 
 // TODO: Make use of the searchable-plugin possibilities instead of querying the database directly

trunk/src/groovy/dbnp/query/SampleSearch.groovy

@@ -84 +84 @@
                         }
                 } else {
-                        Sample.findAll().each {
-                                samples << it;
-                        }
+                        samples = Sample.findAll()
                 }
 

trunk/test/integration/gscf/OntologyTests.groovy

@@ -3 +3 @@
 import grails.test.*
 import dbnp.data.*
-
+import nl.grails.plugins.gdt.*
 import uk.ac.ebi.ontocat.*
 

trunk/test/integration/gscf/SampleTests.groovy

@@ -1 +1 @@
 package gscf
 
-import dbnp.studycapturing.Study
-import dbnp.studycapturing.Template
+import dbnp.studycapturing.*
 import grails.test.GrailsUnitTestCase
-import dbnp.studycapturing.SamplingEvent
-import dbnp.studycapturing.Sample
-import dbnp.studycapturing.TemplateFieldType
-import dbnp.studycapturing.Subject
-import dbnp.studycapturing.EventGroup
+import nl.grails.plugins.gdt.*
 
 /**

trunk/test/integration/gscf/SubjectTests.groovy

@@ -4 +4 @@
 import dbnp.studycapturing.*
 import dbnp.data.*
-
+import nl.grails.plugins.gdt.*
 /**
  * SubjectTests Test