From 06738da7b708d1592b4b820a17b009e5328700df Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 14 Oct 2019 09:27:21 +0800
Subject: [PATCH] * Fix activate parent task logic.

---
 module/task/model.php              | 2 ++
 module/task/view/activate.html.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/module/task/model.php b/module/task/model.php
index bc27582a81..08790cb842 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1502,6 +1502,7 @@ class taskModel extends model
         }
 
         $oldTask = $this->getById($taskID);
+        if($oldTask->parent == '-1') $this->config->task->activate->requiredFields = '';
         $task = fixer::input('post')
             ->setIF(is_numeric($this->post->left), 'left', (float)$this->post->left)
             ->setDefault('left', 0)
@@ -1542,6 +1543,7 @@ class taskModel extends model
         {
             unset($task->left);
             $this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('parent')->eq((int)$taskID)->exec();
+            $this->computeWorkingHours($taskID);
         }
         if($oldTask->story)  $this->loadModel('story')->setStage($oldTask->story);
         if(!dao::isError()) return common::createChanges($oldTask, $task);
diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php
index 05c7c97fd2..922d3b23c9 100644
--- a/module/task/view/activate.html.php
+++ b/module/task/view/activate.html.php
@@ -31,6 +31,7 @@
           <td class='w-p25-f'><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control chosen'");?></td>
           <td></td>
         </tr>
+        <?php if($task->parent != '-1'):?>
         <tr>
           <th><?php echo $lang->task->left;?></th>
           <td>
@@ -40,6 +41,7 @@
             </div>
           </td>
         </tr>
+        <?php endif;?>
         <tr class='hide'>
           <th><?php echo $lang->task->status;?></th>
           <td><?php echo html::hidden('status', 'doing');?></td>