Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* finish task #3664.

Browse Source
This commit is contained in:
wangyidong
2018-03-13 16:40:07 +08:00
parent d35e51a15a
commit c8393b9e08
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+1
View File
@@ -1084,6 +1084,7 @@ class task extends control
{
$story = $this->dao->select('story')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch('story');
$this->task->delete(TABLE_TASK, $taskID);
$this->task->updateParentStatus($task->parent, 'done');
$this->task->computeWorkingHours($task->parent);
if($task->fromBug != 0) $this->dao->update(TABLE_BUG)->set('toTask')->eq(0)->where('id')->eq($task->fromBug)->exec();
if($story) $this->loadModel('story')->setStage($story);
module/task/model.php
+8 -4
View File
@@ -296,12 +296,16 @@ class taskModel extends model
public function updateParentStatus($parentID, $status = 'done')
{
if(!$parentID) return true;
$children = $this->dao->select('id,status')->from(TABLE_TASK)->where('parent')->eq($parentID)->fetchPairs('id', 'status');
$values = array_values(array_unique($children));
if((count($values) == 1 && $values[0] == $status) || (count($values) == 2 && in_array('closed', $values) && $status == 'done'))
$children = $this->dao->select('id,status')->from(TABLE_TASK)->where('parent')->eq($parentID)->andWhere('deleted')->eq(0)->fetchPairs('id', 'status');
$changeStatus = true;
foreach($children as $taskStatus)
{
$this->dao->update(TABLE_TASK)->set('status')->eq($status)->where('id')->eq($parentID)->exec();
if($status == 'done' and $taskStatus != $status and $taskStatus != 'closed' and $taskStatus != 'cancel') $changeStatus = false;
if($status != 'done' and $taskStatus != $status) $changeStatus = false;
}
if($changeStatus) $this->dao->update(TABLE_TASK)->set('status')->eq($status)->where('id')->eq($parentID)->exec();
}
/**
module/task/view/view.html.php
+1 -1
View File
@@ -51,7 +51,7 @@
common::printIcon('task', 'edit', "taskID=$task->id", $task);
common::printCommentIcon('task', $task);
common::printIcon('task', 'create', "productID=0&storyID=0&moduleID=0&taskID=$task->id", $task, 'button', 'copy');
common::printIcon('task', 'delete', "projectID=$task->project&taskID=$task->id", $task);
common::printIcon('task', 'delete', "projectID=$task->project&taskID=$task->id", $task, 'button', '', 'hiddenwin');
echo '</div>';
echo "<div class='btn-group'>";