Changeset 1099 for trunk/grails-app/controllers

Timestamp:

Nov 8, 2010, 12:26:35 PM (10 years ago)

Author:

s.h.sikkema@…

Message:

Authentication test

File:

• trunk/grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (4 diffs)

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

@@ -123 +123 @@
                                 if (flow.jump && flow.jump.action == 'edit' && flow.jump.id) {
                                         // load study
-                                        if (this.loadStudy(flow, flash, [studyid:flow.jump.id])) {
+                                        if (this.loadStudy(flow, flash, [studyid:flow.jump.id],authenticationService.getLoggedInUser())) {
                                                 toStudyPage()
                                         } else {
@@ -180 +180 @@
                         on("next") {
                                 // load study
-                                if (this.loadStudy(flow, flash, params)) {
+                                if (this.loadStudy(flow, flash, params, authenticationService.getLoggedInUser())) {
                                         success()
                                 } else {
@@ -854 +854 @@
          * @returns boolean
          */
-        def loadStudy(flow, flash, params) {
+        def loadStudy(flow, flash, params, user) {
 //              def authenticationService
-        if( authenticationService == null )
-            authenticationService = new AuthenticationService()
-                
+
                 flash.errors = new LinkedHashMap()
                 
@@ -869 +867 @@
                         // the used should had never seen a link to this page, so he should never get
                         // here. That's why we just return false
-                        if (!study.canWrite(authenticationService.getLoggedInUser())) {
-                                return false
+//                      if (!study.canWrite(authenticationService.getLoggedInUser())) {
+            if (!study.canWrite(user)){
+                                return false
                         }