Changeset 832 for trunk/grails-app

Timestamp:

Mar 3, 2011, 11:17:15 AM (14 years ago)

Author:

gav

Message:

Adjust fail sequence of TaskService.saveEntry slightly.

File:

• trunk/grails-app/services/TaskService.groovy (modified) (1 diff)

trunk/grails-app/services/TaskService.groovy

@@ -341 +341 @@
                 return fail(field:"task", code:"task.notFound")
 
+            if(taskInstance.taskStatus.id == 3)
+                return fail(field:"task", code:"task.operationNotPermittedOnCompleteTask")
+
+            // Check for authorisation on recurring tasks.
+            if(taskInstance.taskRecurringSchedule) {
+                if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager'))
+                    return fail(field:"task", code:"task.operationNotPermittedOnRecurringTaskWithoutAuth")
+            }
+
             if(result.entryInstance.hasErrors() || !result.entryInstance.save())
                 return fail(code:"default.create.failure")
-
-            if(taskInstance.taskStatus.id == 3)
-                return fail(field:"task", code:"task.operationNotPermittedOnCompleteTask")
-
-            // Check for authorisation on recurring tasks.
-            if(taskInstance.taskRecurringSchedule) {
-                if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager'))
-                    return fail(field:"task", code:"task.operationNotPermittedOnRecurringTaskWithoutAuth")
-            }
 
             // If task status is "Not Started" and entry type is "Work Done" and time has been booked.