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

Merge branch '18.x' into zentaoipd

Browse Source
This commit is contained in:
tanghucheng
2023-07-13 17:26:49 +08:00
parent 1de24291af ef9792133e
commit 6b0db86d24
92 changed files with 5166 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+11 -2
View File
@@ -3803,7 +3803,16 @@ class taskModel extends model
$storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));
$canView = common::hasPriv('task', 'view');
$taskLink = helper::createLink('task', 'view', "taskID=$task->id");
if($this->config->vision == 'lite')
{
$taskLink = helper::createLink('task', 'view', "taskID=$task->id", '', true);
$linkClass = 'class="iframe"';
}
else
{
$taskLink = helper::createLink('task', 'view', "taskID=$task->id");
$linkClass = '';
}
$account = $this->app->user->account;
$id = $col->id;
if($col->show)
@@ -3862,7 +3871,7 @@ class taskModel extends model
if($task->module and isset($modulePairs[$task->module])) echo "<span class='label label-gray label-badge'>" . $modulePairs[$task->module] . '</span> ';
if($task->parent > 0) echo '<span class="label label-badge label-light" title="' . $this->lang->task->children . '">' . $this->lang->task->childrenAB . '</span> ';
if(!empty($task->team)) echo '<span class="label label-badge label-light" title="' . $this->lang->task->multiple . '">' . $this->lang->task->multipleAB . '</span> ';
echo $canView ? html::a($taskLink, $task->name, null, "style='color: $task->color' title='$task->name'") : "<span style='color: $task->color'>$task->name</span>";
echo $canView ? html::a($taskLink, $task->name, null, "$linkClass style='color: $task->color' title='$task->name'") : "<span style='color: $task->color'>$task->name</span>";
if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-double-right"></i></a>';
if($task->fromBug) echo html::a(helper::createLink('bug', 'view', "id=$task->fromBug"), "[BUG#$task->fromBug]", '', "class='bug'");
break;