* Finish task #5327.

flpgit · Mar 18, 2019 · 7004af8 · 7004af8
1 parent 62249b0
commit 7004af8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
@@ -106,6 +106,7 @@
 $lang->task->transfer          = 'Transfer';
 $lang->task->transferTo        = 'Transfer To';
 $lang->task->children          = 'Child Task';
+$lang->task->unlinkParent      = 'Unlink Parent';
 $lang->task->childrenAB        = 'Child';
 $lang->task->parent            = 'Parent Task';
 $lang->task->parentAB          = 'Parent Task';

diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
@@ -106,6 +106,7 @@
 $lang->task->transfer         = '转交';
 $lang->task->transferTo       = '转交给';
 $lang->task->children         = '子任务';
+$lang->task->unlinkParent     = '取消子任务';
 $lang->task->childrenAB       = '子';
 $lang->task->parent           = '父任务';
 $lang->task->parentAB         = '父';

diff --git a/module/task/model.php b/module/task/model.php
@@ -617,12 +617,13 @@ public function update($taskID)
             ->setIF($this->post->assignedTo != $oldTask->assignedTo, 'assignedDate', $now)
 
             ->setIF($this->post->status == 'wait' and $this->post->left == $oldTask->left and $this->post->consumed == 0 and $this->post->estimate, 'left', $this->post->estimate)
+            ->setIF(isset($_POST['unlinkParent']), 'parent', 0)
 
             ->setDefault('lastEditedBy',   $this->app->user->account)
             ->add('lastEditedDate', $now)
             ->stripTags($this->config->task->editor->edit['id'], $this->config->allowedTags)
             ->join('mailto', ',')
-            ->remove('comment,files,labels,uid,multiple,team,teamEstimate,teamConsumed,teamLeft,contactListMenu')
+            ->remove('comment,files,labels,uid,multiple,team,teamEstimate,teamConsumed,teamLeft,contactListMenu,unlinkParent')
             ->get();
 
         if($task->consumed < $oldTask->consumed) die(js::error($this->lang->task->error->consumedSmall));
@@ -698,6 +699,7 @@ public function update($taskID)
 
         if($oldTask->parent > 0)
         {
+            if($task->parent == 0) $this->computeWorkingHours($oldTask->parent);
             $this->updateParentStatus($taskID);
             $this->computeBeginAndEnd($oldTask->parent);
         }
@@ -1652,6 +1654,11 @@ public function getParentTaskPairs($projectID)
             ->andWhere('project')->eq($projectID)
             ->fetchPairs();
 
+        foreach($tasks as $id => $name)
+        {
+            $taskTeam = $this->dao->select('*')->from(TABLE_TEAM)->where('root')->eq($id)->andWhere('type')->eq('task')->fetch();
+            if(!empty($taskTeam)) unset($tasks[$id]);
+        }
         return array('' => '') + $tasks ;
     }
 

diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
@@ -109,6 +109,12 @@
                 <td><?php echo html::select('parent', $tasks, $task->parent, "class='form-control chosen'");?></td>
               </tr>
               <?php endif;?>
+              <?php if($task->parent > 0):?>
+              <tr>
+                <th><?php echo $lang->task->unlinkParent;?></th>
+                <td><?php echo html::checkbox('unlinkParent', '');?></td>
+              </tr>
+              <?php endif;?>
               <tr>
                 <th><?php echo $lang->task->assignedTo;?></th>
                 <td><span id="assignedToIdBox"><?php echo html::select('assignedTo', $members, $task->assignedTo, "class='form-control chosen'");?></span></td>

diff --git a/module/testtask/control.php b/module/testtask/control.php
@@ -832,7 +832,8 @@ public function runCase($runID, $caseID = 0, $version = 0)
             $caseResult = $this->testtask->createResult($runID);
             if(dao::isError()) die(js::error(dao::getError()));
 
-            if($caseResult == 'fail') {
+            if($caseResult == 'fail')
+            {
 
                 $response['result']  = 'success';
                 $response['locate']  = $this->createLink('testtask', 'results',"runID=$runID&caseID=$caseID&version=$version");