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

Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8

Browse Source
This commit is contained in:
wumo
2018-03-23 04:12:09 +08:00
parent ef8e72fc0e 6c7e587b20
commit 62ccee6316
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+4 -2
View File
@@ -329,7 +329,7 @@ class taskModel extends model
$status = 'cancel';
}
$parentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($parentID)->fetchAll();
$parentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($parentID)->fetch();
if($status and $parentTask->status != $status)
{
$now = helper::now();
@@ -359,6 +359,7 @@ class taskModel extends model
$task->assignedDate = $now;
$task->closedBy = $this->app->user->account;
$task->closedDate = $now;
$task->closedReason = 'done';
}
if($status == 'doing')
@@ -369,6 +370,7 @@ class taskModel extends model
$task->finishedDate = '';
$task->closedBy = '';
$task->closedDate = '';
$task->closedReason = '';
}
$task->lastEditedBy = $this->app->user->account;
@@ -2175,7 +2177,7 @@ class taskModel extends model
break;
case 'name':
if(!empty($task->product) && isset($branchGroups[$task->product][$task->branch])) echo "<span class='label label-info label-badge'>" . $branchGroups[$task->product][$task->branch] . '</span> ';
if($task->module and isset($modulePairs[$task->module])) echo "<span class='label label-info label-badge'>" . $modulePairs[$task->module] . '</span> ';
if(empty($task->children) and $task->module and isset($modulePairs[$task->module])) echo "<span class='label label-info label-badge'>" . $modulePairs[$task->module] . '</span> ';
if($child or !empty($task->parent)) echo '<span class="label">' . $this->lang->task->childrenAB . '</span> ';
if(!empty($task->team)) echo '<span class="label">' . $this->lang->task->multipleAB . '</span> ';
echo $canView ? html::a($taskLink, $task->name, null, "style='color: $task->color'") : "<span style='color: $task->color'>$task->name</span>";