Changeset 802 for trunk/grails-app/services

Timestamp:

Feb 10, 2011, 12:17:55 PM (14 years ago)

Author:

gav

Message:

Task trash improvements.
Allow trashed parentTask to break subTask links (only with auth).
Prevent trashing of tasks linked to taskProcedure or Parent PM type tasks.

File:

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

trunk/grails-app/services/TaskService.groovy

@@ -685 +685 @@
             }
 
+            // Check for authorisation on tasks having subTasks.
+            if(result.taskInstance.subTasks) {
+                if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager'))
+                    return fail(field:"subTasks", code:"task.operationNotPermittedOnTaskHavingSubTasksWithoutAuth")
+            }
+
+            // Check for taskProcedure using this task as linkedTask.
+            if(result.taskInstance.taskProcedure?.linkedTask?.id == result.taskInstance.id)
+                return fail(field:"taskProcedure", code:"task.operationNotPermittedOnTaskLinkedToProcedure")
+
+            // Check for Parent PM task type.
+            if(result.taskInstance.taskType.id == 6)
+                return fail(field:"taskProcedure", code:"task.operationNotPermittedOnParentPmTask")
+
             result.taskInstance.trash = true
             result.taskInstance.attentionFlag = false
             result.taskInstance.taskRecurringSchedule?.enabled = false
+            result.taskInstance.subTasks.each {
+                it.parentTask = null
+            }
 
             if(result.taskInstance.hasErrors() || !result.taskInstance.save())