From d689db05a7a286dca7a9a1b8ef9a0c13fd277af1 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Mon, 28 Mar 2022 13:10:11 +0800
Subject: [PATCH] * Fix bug #11919.

---
 module/task/model.php | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 854b1f972d..ed5977f420 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1866,7 +1866,6 @@ class taskModel extends model
      */
     public function cancel($taskID, $extra = '')
     {
-        $this->loadModel('action');
         $extra = str_replace(array(',', ' '), array('&', ''), $extra);
         parse_str($extra, $output);
 
@@ -1889,19 +1888,17 @@ class taskModel extends model
         if($oldTask->parent > 0) $this->updateParentStatus($taskID);
         if($oldTask->parent == '-1')
         {
-            $oldChildrenTasks = $this->dao->select('*')->from(TABLE_TASK)->where('parent')->eq($taskID)->andWhere('deleted')->eq(0)->fetchAll('id');
+            $oldChildrenTasks = $this->dao->select('*')->from(TABLE_TASK)->where('parent')->eq($taskID)->fetchAll('id');
             unset($task->assignedTo);
             $this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('parent')->eq((int)$taskID)->exec();
             $this->dao->update(TABLE_TASK)->set('assignedTo=openedBy')->where('parent')->eq((int)$taskID)->exec();
-            if(!dao::isError())
+            if(!dao::isError() and count($oldChildrenTasks) > 0)
             {
-                if(count($oldChildrenTasks) > 0)
+                $this->loadModel('action');
+                foreach($oldChildrenTasks as $oldChildrenTask)
                 {
-                    foreach($oldChildrenTasks as $oldChildrenTask)
-                    {
-                        $actionID  = $this->action->create('task', $oldChildrenTask->id, 'Canceled', $this->post->comment);
-                        $this->action->logHistory($actionID, common::createChanges($oldChildrenTask, $task));
-                    }
+                    $actionID  = $this->action->create('task', $oldChildrenTask->id, 'Canceled', $this->post->comment);
+                    $this->action->logHistory($actionID, common::createChanges($oldChildrenTask, $task));
                 }
             }
         }
@@ -1924,7 +1921,6 @@ class taskModel extends model
      */
     public function activate($taskID, $extra)
     {
-        $this->loadModel('action');
         $extra = str_replace(array(',', ' '), array('&', ''), $extra);
         parse_str($extra, $output);
 
@@ -1975,19 +1971,17 @@ class taskModel extends model
         if($oldTask->parent > 0) $this->updateParentStatus($taskID);
         if($oldTask->parent == '-1')
         {
-            $oldChildrenTasks = $this->dao->select('*')->from(TABLE_TASK)->where('parent')->eq($taskID)->andWhere('deleted')->eq(0)->fetchAll('id');
+            $oldChildrenTasks = $this->dao->select('*')->from(TABLE_TASK)->where('parent')->eq($taskID)->fetchAll('id');
             unset($task->left);
             $this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('parent')->eq((int)$taskID)->exec();
             $this->computeWorkingHours($taskID);
-            if(!dao::isError())
+            if(!dao::isError() and count($oldChildrenTasks) > 0)
             {
-                if(count($oldChildrenTasks) > 0)
+                $this->loadModel('action');
+                foreach($oldChildrenTasks as $oldChildrenTask)
                 {
-                    foreach($oldChildrenTasks as $oldChildrenTask)
-                    {
-                        $actionID  = $this->action->create('task', $oldChildrenTask->id, 'Activated', $this->post->comment);
-                        $this->action->logHistory($actionID, common::createChanges($oldChildrenTask, $task));
-                    }
+                    $actionID  = $this->action->create('task', $oldChildrenTask->id, 'Activated', $this->post->comment);
+                    $this->action->logHistory($actionID, common::createChanges($oldChildrenTask, $task));
                 }
             }
         }