Changeset 2240

Timestamp:

May 31, 2012, 3:10:23 PM (7 years ago)

Author:

ferryjagers@…

Message:

templateAdmin role, only users with this role are allowed to modify templates.

Location:

trunk

Files:

• grails-app/conf/BootStrap.groovy (modified) (1 diff)
• grails-app/conf/BuildConfig.groovy (modified) (2 diffs)
• grails-app/domain/dbnp/authentication/SecUser.groovy (modified) (1 diff)
• grails-app/views/api/index.gsp (modified) (1 diff)
• grails-app/views/forms (added)
• grails-app/views/forms/templateRequestForm.gsp (added)
• web-app/js/studywizard.js (modified) (2 diffs)

trunk/grails-app/conf/BootStrap.groovy

@@ -41 +41 @@
                 // set up a client (=external program) role if it does not exist
                 def clientRole = SecRole.findByAuthority('ROLE_CLIENT') ?: new SecRole(authority: 'ROLE_CLIENT').save(failOnError: true)
+        def templateAdminRole = SecRole.findByAuthority('ROLE_TEMPLATEADMIN') ?: new SecRole(authority: 'ROLE_TEMPLATEADMIN').save(failOnError: true)
 
                 // set up authentication (if required)

trunk/grails-app/conf/BuildConfig.groovy

@@ -61 +61 @@
         plugins {
                 compile(":hibernate:$grailsVersion")
-                compile ':tomcat:1.3.9'
+                compile ':tomcat:1.3.7'
                 compile ':jquery:1.7.1'
                 compile ':grom:0.2.3'
@@ -67 +67 @@
                 compile ':crypto:2.0'
                 compile ':spring-security-core:1.2.7.3'
-                compile(':gdt:0.2.1') {
+                compile(':gdt:0.2.2') {
                         // disable plugin dependency transition because it's horribly broken
                         // note: this assumes that ajaxflow, jquery and cryto stay included

trunk/grails-app/domain/dbnp/authentication/SecUser.groovy

@@ -55 +55 @@
                 return getAuthorities().contains(SecRole.findByAuthority('ROLE_ADMIN'));
         }
+
+    public boolean hasTemplateAdminRights() {
+        return getAuthorities().contains(SecRole.findByAuthority('ROLE_TEMPLATEADMIN'));
+    }
         
         /**

trunk/grails-app/views/api/index.gsp

@@ -75 +75 @@
 <h2>SDK packages</h2>
     <li><a href="https://github.com/4np/gscf4php" target="_new">PHP</a> - Object Oriented SDK for interacting with GSCF</li>
+    <li><a href="https://github.com/thomaskelder/R2GSCF" target="_new">R</a> - R Client to connect to GSCF</li>
 
 <a name="authenticate"></a>

trunk/web-app/js/studywizard.js

@@ -49 +49 @@
         });
 
-        // handle template selects
-        new SelectAddMore().init({
-                rel      : 'template',
-                url      : baseUrl + '/templateEditor',
-                vars    : 'entity,ontologies',
-                label   : 'add / modify..',
-                style   : 'modify',
-                onClose : function(scope) {
-                        refreshFlow();
-                }
-        });
-
         // Handle person selects
         new SelectAddMore().init({
@@ -72 +60 @@
                 }
         });
+
+    // handle template selects
+    new SelectAddMore().init({
+        rel      : 'templateAdmin',
+        url      : baseUrl + '/templateEditor',
+        vars    : 'entity,ontologies',
+        label   : 'add / modify..',
+        style   : 'modify',
+        onClose : function(scope) {
+        refreshFlow();
+        }
+    });
+
+    // handle template selects
+    new SelectAddMore().init({
+        rel      : 'templateUser',
+        url      : baseUrl + '/forms/templateRequestForm.gsp',
+        vars    : 'entity,ontologies',
+        label   : 'email request..',
+        style   : 'modify',
+        onClose : function(scope) {
+        refreshFlow();
+        }
+    });
 
         // Handle personRole selects