Changeset 631 for trunk

Timestamp:

Jul 15, 2010, 4:22:04 PM (14 years ago)

Author:

gav

Message:

Check for authorisation on recurring tasks.

Location:

trunk/grails-app

Files:

• i18n/messages.properties (modified) (1 diff)
• services/InventoryMovementService.groovy (modified) (3 diffs)
• services/TaskService.groovy (modified) (11 diffs)

trunk/grails-app/i18n/messages.properties

@@ -136 +136 @@
 task.operationNotPermittedOnCompleteTask=This operation is not permitted on a complete task.
 task.operationNotPermittedOnTaskInTrash=This operation is not permitted on a task that is in the trash.
+task.operationNotPermittedOnRecurringTaskWithoutAuth=This operation is not permitted on a recurring task without authorisation.
 task.failedToSave=Could not complete operation, task failed to save.
 task.modifications.failedToSave=Could not complete operation, as task modification record failed to save.

trunk/grails-app/services/InventoryMovementService.groovy

@@ -4 +4 @@
 
     def authService
+    def authenticateService
 
     def reverseMove(params) {
@@ -34 +35 @@
                 if(result.inventoryMovementInstance.task?.taskStatus?.id == 3)
                     return fail(field:"task", code:"task.operationNotPermittedOnCompleteTask")
+
+                // Check for authorisation on recurring tasks.
+                if(result.inventoryMovementInstance.task?.taskRecurringSchedule) {
+                    if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager,ROLE_InventoryManager'))
+                        return fail(field:"task", code:"task.operationNotPermittedOnRecurringTaskWithoutAuth")
+                }
+
             }
 
@@ -95 +103 @@
                 if(result.inventoryMovementInstance.task.taskStatus.id == 3)
                     return fail(field:"task", code:"task.operationNotPermittedOnCompleteTask")
+
+                // Check for authorisation on recurring tasks.
+                if(result.inventoryMovementInstance.task.taskRecurringSchedule) {
+                    if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager,ROLE_InventoryManager'))
+                        return fail(field:"task", code:"task.operationNotPermittedOnRecurringTaskWithoutAuth")
+                }
             }
 

trunk/grails-app/services/TaskService.groovy

@@ -11 +11 @@
     def authService
     def dateUtilService
+    def authenticateService
     def assignedGroupService
     def assignedPersonService
@@ -325 +326 @@
                 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.
             // Then we create the started modification and set task status.
@@ -379 +386 @@
             }
 
+            // Check for authorisation on recurring tasks.
+            if(result.taskInstance.taskRecurringSchedule) {
+                if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager'))
+                    return fail(field:"taskRecurringSchedule", code:"task.operationNotPermittedOnRecurringTaskWithoutAuth")
+            }
+
             result.taskInstance.properties = params
 
@@ -425 +438 @@
             }
 
+            // Check for authorisation on recurring tasks.
+            if(result.taskInstance.taskRecurringSchedule) {
+                if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager'))
+                    return fail(field:"taskRecurringSchedule", code:"task.operationNotPermittedOnRecurringTaskWithoutAuth")
+            }
+
             result.taskInstance.taskStatus = TaskStatus.get(3)
             result.taskInstance.attentionFlag = false
@@ -474 +493 @@
             }
 
+            // Check for authorisation on recurring tasks.
+            if(result.taskInstance.taskRecurringSchedule) {
+                if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager'))
+                    return fail(field:"taskRecurringSchedule", code:"task.operationNotPermittedOnRecurringTaskWithoutAuth")
+            }
+
             result.taskInstance.attentionFlag = true
 
@@ -520 +545 @@
             }
 
+            // Check for authorisation on recurring tasks.
+            if(result.taskInstance.taskRecurringSchedule) {
+                if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager'))
+                    return fail(field:"taskRecurringSchedule", code:"task.operationNotPermittedOnRecurringTaskWithoutAuth")
+            }
+
             result.taskInstance.attentionFlag = false
 
@@ -566 +597 @@
             }
 
+            // Check for authorisation on recurring tasks.
+            if(result.taskInstance.taskRecurringSchedule) {
+                if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager'))
+                    return fail(field:"taskRecurringSchedule", code:"task.operationNotPermittedOnRecurringTaskWithoutAuth")
+            }
+
             def isInProgress = false
             result.taskInstance.entries.each() {
@@ -621 +658 @@
             }
 
+            // Check for authorisation on recurring tasks.
+            if(result.taskInstance.taskRecurringSchedule) {
+                if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager'))
+                    return fail(field:"taskRecurringSchedule", code:"task.operationNotPermittedOnRecurringTaskWithoutAuth")
+            }
+
             result.taskInstance.trash = true
             result.taskInstance.attentionFlag = false
@@ -669 +712 @@
             }
 
+            // Check for authorisation on recurring tasks.
+            if(result.taskInstance.taskRecurringSchedule) {
+                if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager'))
+                    return fail(field:"taskRecurringSchedule", code:"task.operationNotPermittedOnRecurringTaskWithoutAuth")
+            }
+
             result.taskInstance.trash = false
 
@@ -715 +764 @@
             }
 
+            // Check for authorisation on recurring tasks.
+            if(result.taskInstance.taskRecurringSchedule) {
+                if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager'))
+                    return fail(field:"taskRecurringSchedule", code:"task.operationNotPermittedOnRecurringTaskWithoutAuth")
+            }
+
             result.taskInstance.approved = true
 
@@ -759 +814 @@
                 if(result.taskInstance.version > params.version.toLong())
                     return fail(field:"version", code:"default.optimistic.locking.failure")
+            }
+
+            // Check for authorisation on recurring tasks.
+            if(result.taskInstance.taskRecurringSchedule) {
+                if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager'))
+                    return fail(field:"taskRecurringSchedule", code:"task.operationNotPermittedOnRecurringTaskWithoutAuth")
             }