Merge pull-request #847 (recurring tasks)

1 files changed, 10 insertions, 1 deletions

diff --git a/app/Model/TaskStatus.php b/app/Model/TaskStatus.php
index 30a65e1e..1ae8bfeb 100644
--- a/app/Model/TaskStatus.php
+++ b/app/Model/TaskStatus.php
@@ -89,7 +89,9 @@ class TaskStatus extends Base
      */
     private function changeStatus($task_id, $status, $date_completed, $event)
     {
-        if (! $this->taskFinder->exists($task_id)) {
+        $task = $this->taskFinder->getById($task_id);
+
+        if (!$task['id']) {
             return false;
         }
 
@@ -107,6 +109,13 @@ class TaskStatus extends Base
                 $event,
                 new TaskEvent(array('task_id' => $task_id) + $this->taskFinder->getById($task_id))
             );
+
+            if ($status == Task::STATUS_CLOSED
+                && $task['recurrence_status'] == Task::RECURE_STATUS_PENDING
+                && $task['recurrence_trigger'] == Task::RECURE_TRIGGER_CLOSE)
+            {
+                $this->taskDuplication->createRecurrence($task_id);
+            }
         }
 
         return $result;