Changeset 478 for trunk

Timestamp:

Apr 7, 2010, 5:37:40 PM (15 years ago)

Author:

gav

Message:

Setup approved and scheduled during subTask creation.

File:

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

trunk/grails-app/services/TaskService.groovy

@@ -185 +185 @@
         p.targetStartDate = params.targetStartDate ?: parentTask.targetStartDate
         p.targetCompletionDate = params.targetCompletionDate ?: parentTask.targetCompletionDate
+        p.scheduled = params.scheduled ?:  parentTask.scheduled
 
         p.taskGroup = params.taskGroup ?: parentTask.taskGroup
@@ -194 +195 @@
         p.associatedAssets = params.associatedAssets ?: new ArrayList(parentTask.associatedAssets) // Collection.
 
-        // Only if supplied, otherwise this would be copying.
-        if(params.scheduled) p.scheduled = params.scheduled
-        if(params.approved) p.approved = params.approved
-
         // Supplied by recurring tasks.
         if(params.taskProcedure) p.taskProcedure = params.taskProcedure
@@ -210 +207 @@
         // Create the sub task and return the result.
         result = save(p)
+
+        // Approve.
+        if(!result.error && parentTask.approved) {
+            p = [:]
+            p.id = result.taskInstance.id
+            approve(p)
+        }
+
+        // Success.
+        return result
 
     } // end createSubTask()