Changeset 1490 for trunk/grails-app

Timestamp:

Feb 4, 2011, 10:55:05 AM (10 years ago)

Author:

robert@…

Message:

Implemented enhancement #258, opening an assay outside the frame. This functionality needs an upgrade of the gdt plugin first.
Also added authorization to the assayModule controller, such that only administrators can use it.

Location:

trunk/grails-app

Files:

• conf/DatabaseUpgrade.groovy (modified) (2 diffs)
• controllers/dbnp/studycapturing/AssayModuleController.groovy (modified) (1 diff)
• views/study/show_assays.gsp (modified) (1 diff)

trunk/grails-app/conf/DatabaseUpgrade.groovy

@@ -32 +32 @@
                 changeStudyDescriptionToText(sql, db)           // r1327
                 changeTemplateTextFieldSignatures(sql, db)      // prevent Grails issue, see http://jira.codehaus.org/browse/GRAILS-6754
+                setAssayModuleDefaultValues(sql, db)            // r1304
         }
 
@@ -129 +130 @@
                 }
         }
+        
+        /**
+        * The fields 'notify' and 'openInFrame' have been added to AssayModule. However, there
+        * seems to be no method to setting the default values of these fields in the database. They
+        * are set to NULL by default, so all existing fields have 'NULL' set. 
+        * This method sets the default values
+        * @param sql
+        * @param db
+        */
+   public static void setAssayModuleDefaultValues(sql, db) {
+           "performing database upgrade: assay_module default values for boolean fields".grom()
+           try {
+                   sql.execute("UPDATE assay_module SET notify = 0 WHERE notify IS NULL")
+           } catch (Exception e) {
+                   println "setAssayModuleDefaultValues notify field couldn't be set to default value: " + e.getMessage()
+           }
+           try {
+                   sql.execute("UPDATE assay_module SET open_in_frame = 1 WHERE open_in_frame IS NULL")
+           } catch (Exception e) {
+                   println "setAssayModuleDefaultValues openInFrame field couldn't be set to default value: " + e.getMessage()
+                   println "Maybe gdt plugin is not updated yet after revision 109"
+           }
+   }
 }

trunk/grails-app/controllers/dbnp/studycapturing/AssayModuleController.groovy

@@ -15 +15 @@
 package dbnp.studycapturing
 
+import grails.plugins.springsecurity.Secured
+
+@Secured(['ROLE_ADMIN'])
 class AssayModuleController {
         // Scaffold this class to circumvent not being able to add assays (0.4)

trunk/grails-app/views/study/show_assays.gsp

@@ -32 +32 @@
                   <td>${assay.module.platform}</td>
                   <td>
-          <jumpbar:link frameSource="${assay.module.url}/assay/showByToken/${assay.giveUUID()}" pageTitle="Metabolomics Module">
-                        view
-                  </jumpbar:link></td>
+                        <g:if test="${assay.module.openInFrame == null || assay.module.openInFrame == Boolean.TRUE}">
+                  <jumpbar:link frameSource="${assay.module.url}/assay/showByToken/${assay.giveUUID()}" pageTitle="Metabolomics Module">
+                                view
+                          </jumpbar:link>
+                         </g:if>
+                         <g:else>
+                                <g:link url="${assay.module.url}/assay/showByToken/${assay.giveUUID()}">view</g:link>
+                         </g:else>
+                </td>
                   <td>
                         <% sortedAssaySamples = assay.samples.sort( { a, b -> a.name <=> b.name } as Comparator )  %>