Changeset 809 for trunk/grails-app/services/TaskService.groovy

Timestamp:

Feb 16, 2011, 8:10:39 PM (14 years ago)

Author:

gav

Message:

Domain change, first draft of TaskProcedureRevisions.

File:

• trunk/grails-app/services/TaskService.groovy (modified) (3 diffs)

trunk/grails-app/services/TaskService.groovy

@@ -188 +188 @@
     * Creates a subTask copying sane attributes from the parentTask unless otherwise specified in params.
     * The targetStartDate and targetCompletionDate default to today since that is the sane thing to do.
-    * The taskProcedure is only assigned to the sub task if supplied in params.
+    * The taskProcedureRevision is only assigned to the sub task if supplied in params.
     * The assignedPersons and assignedGroups are only added to the sub task if supplied in params.
     * The positiveFault property is never set on the subTask.
@@ -228 +228 @@
 
         // Supplied by recurring tasks.
-        if(params.taskProcedure) p.taskProcedure = params.taskProcedure
+        if(params.taskProcedureRevision) p.taskProcedureRevision = params.taskProcedureRevision
         if(params.assignedGroups) p.assignedGroups = params.assignedGroups // Collection.
         if(params.assignedPersons) p.assignedPersons = params.assignedPersons // Collection.
@@ -691 +691 @@
             }
 
-            // 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 taskProcedureRevision using this task as linkedTask.
+            if(result.taskInstance.taskProcedureRevision?.linkedTask?.id == result.taskInstance.id) {
+                if(!authenticateService.ifAnyGranted('ROLE_AppAdmin,ROLE_Manager,ROLE_TaskManager'))
+                    return fail(field:"taskProcedureRevision", code:"task.operationNotPermittedOnTaskLinkedToProcedureWithoutAuth")
+            }
 
             // Check for Parent PM task type.
             if(result.taskInstance.taskType.id == 6)
-                return fail(field:"taskProcedure", code:"task.operationNotPermittedOnParentPmTask")
+                return fail(field:"taskType", code:"task.operationNotPermittedOnParentPmTask")
 
             result.taskInstance.trash = true