Changeset 458

Timestamp:

May 25, 2010, 11:18:21 AM (14 years ago)

Author:

roberth

Message:

Subject class changed again to improve performance. Also updated bootstrap in order to keep the study capture wizard running

Location:

trunk/grails-app

Files:

• conf/BootStrap.groovy (modified) (2 diffs)
• domain/dbnp/studycapturing/Subject.groovy (modified) (2 diffs)

trunk/grails-app/conf/BootStrap.groovy

@@ -19 +19 @@
                 // define timezone
                 System.setProperty('user.timezone', 'CET')
-
-                // Ontologies must be connected to the templatefields in runtime
-                // because the Ontology.findByNcboId is not available otherwise
-                //TemplateEntity.getField( Subject.domainFields, 'species' ).ontologies = [Ontology.findByNcboId(1132)]
-                TemplateEntity.getField( Sample.domainFields, 'material' ).ontologies = [Ontology.findByNcboId(1005)]
 
                 // we could also check if we are in development by GrailsUtil.environment == GrailsApplication.ENV_DEVELOPMENT
@@ -740 +735 @@
                         }
                 }
+
+                // Ontologies must be connected to the templatefields in runtime
+                // because the Ontology.findByNcboId is not available otherwise
+                TemplateEntity.getField( Subject.domainFields, 'species' ).ontologies = [Ontology.findByNcboId(1132)]
+                TemplateEntity.getField( Sample.domainFields, 'material' ).ontologies = [Ontology.findByNcboId(1005)]
+
         }
 

trunk/grails-app/domain/dbnp/studycapturing/Subject.groovy

@@ -21 +21 @@
          * @return List
          */
-        List<TemplateField> giveDomainFields() {
+        List<TemplateField> giveDomainFields() { return Subject.domainFields; }
+
+        static List<TemplateField> domainFields =
                 [
                         new TemplateField(
@@ -31 +33 @@
                                 name: 'species',
                                 type: TemplateFieldType.ONTOLOGYTERM,
-                                ontologies: [Ontology.findByNcboId(1132)],
                                 comment: "The species name is based on the NEWT ontology; if a species is missing, please add it to the ontology using 'add more'")
                 ]
-        }
 }