Changeset 1791

Timestamp:

Apr 27, 2011, 12:10:16 PM (9 years ago)

Author:

work@…

Message:

RE-committed Robert's change after the SVN was fixed, original commit log was:

• Added environmental ontology (1069) to the subject.species field, to fix issue #353

Location:

trunk/grails-app

Files:

• conf/BootStrap.groovy (modified) (1 diff)
• views/studyWizard/pages/_subjects.gsp (modified) (2 diffs)

trunk/grails-app/conf/BootStrap.groovy

@@ -84 +84 @@
                  * @see dbnp.studycapturing.Sample
                  */
-                TemplateEntity.getField(Subject.domainFields, 'species').ontologies = [Ontology.getOrCreateOntologyByNcboId(1132)]
-                TemplateEntity.getField(Sample.domainFields, 'material').ontologies = [Ontology.getOrCreateOntologyByNcboId(1005)]
+                TemplateEntity.getField(Subject.domainFields, 'species').ontologies = [
+                        Ontology.getOrCreateOntologyByNcboId(1132),             // NCBI Organismal Classification
+                        Ontology.getOrCreateOntologyByNcboId(1069)              // Environmental Ontology
+                ]
+                TemplateEntity.getField(Sample.domainFields, 'material').ontologies = [
+                        Ontology.getOrCreateOntologyByNcboId(1005)              // BRENDA Tissue / enzyme source
+                ]
         }
 

trunk/grails-app/views/studyWizard/pages/_subjects.gsp

@@ -14 +14 @@
  * $Date$
  */
+
+def speciesOntologies = dbnp.studycapturing.Subject.giveDomainFields().find { it.name == 'species' }.ontologies.collect { it.ncboId }
 %>
 <af:page>
@@ -31 +33 @@
                 The species of the subjects you would like to add to your study
         </af:termElement>
-        <af:templateElement name="template" description="with template" value="${values?.template}" error="template" entity="${dbnp.studycapturing.Subject}" ontologies="1132" addDummy="true">
+        <af:templateElement name="template" description="with template" value="${values?.template}" error="template" entity="${dbnp.studycapturing.Subject}" ontologies="${speciesOntologies.join( ',' )}" addDummy="true">
                 The template to use for these subjects
         </af:templateElement>