Changeset 1432

Show
Ignore:
Timestamp:
22-01-11 16:07:36 (3 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:
6 modified

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/controllers/dbnp/query/AdvancedQueryController.groovy

    r1430 r1432  
    22 
    33import dbnp.studycapturing.* 
     4import nl.grails.plugins.gdt.* 
    45 
    56// TODO: Make use of the searchable-plugin possibilities instead of querying the database directly 
  • trunk/lib

    • Property svn:ignore set to
      mysql-connector-java-5.1.8-bin.jar
  • trunk/src/groovy/dbnp/query/SampleSearch.groovy

    r1430 r1432  
    8484                        } 
    8585                } else { 
    86                         Sample.findAll().each { 
    87                                 samples << it; 
    88                         } 
     86                        samples = Sample.findAll() 
    8987                } 
    9088 
  • trunk/test/integration/gscf/OntologyTests.groovy

    r1430 r1432  
    33import grails.test.* 
    44import dbnp.data.* 
    5  
     5import nl.grails.plugins.gdt.* 
    66import uk.ac.ebi.ontocat.* 
    77 
  • trunk/test/integration/gscf/SampleTests.groovy

    r1430 r1432  
    11package gscf 
    22 
    3 import dbnp.studycapturing.Study 
    4 import dbnp.studycapturing.Template 
     3import dbnp.studycapturing.* 
    54import grails.test.GrailsUnitTestCase 
    6 import dbnp.studycapturing.SamplingEvent 
    7 import dbnp.studycapturing.Sample 
    8 import dbnp.studycapturing.TemplateFieldType 
    9 import dbnp.studycapturing.Subject 
    10 import dbnp.studycapturing.EventGroup 
     5import nl.grails.plugins.gdt.* 
    116 
    127/** 
  • trunk/test/integration/gscf/SubjectTests.groovy

    r1430 r1432  
    44import dbnp.studycapturing.* 
    55import dbnp.data.* 
    6  
     6import nl.grails.plugins.gdt.* 
    77/** 
    88 * SubjectTests Test