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

* Code for task #6484.

Browse Source
This commit is contained in:
Yagami
2019-11-26 10:44:43 +08:00
parent 37d0e1d89a
commit 994823a24c
5 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+2 -2
View File
@@ -1378,9 +1378,9 @@ class task extends control
}
/* Get related objects title or names. */
$this->loadModel('tree');
$relatedStories = $this->dao->select('id,title')->from(TABLE_STORY)->where('id')->in($relatedStoryIdList)->fetchPairs();
$relatedFiles = $this->dao->select('id, objectID, pathname, title')->from(TABLE_FILE)->where('objectType')->eq('task')->andWhere('objectID')->in(@array_keys($tasks))->andWhere('extra')->ne('editor')->fetchGroup('objectID');
$relatedModules = $this->loadModel('tree')->getAllModulePairs('task');
if($tasks)
{
@@ -1474,7 +1474,7 @@ class task extends control
if(isset($taskLang->priList[$task->pri])) $task->pri = $taskLang->priList[$task->pri];
if(isset($taskLang->statusList[$task->status])) $task->status = $this->processStatus('task', $task);
if(isset($taskLang->reasonList[$task->closedReason])) $task->closedReason = $taskLang->reasonList[$task->closedReason];
$task->module = $task->module ? $this->tree->getModulePathByID($task->module) . "(#$task->module)" : '';
if(isset($relatedModules[$task->module])) $task->module = $relatedModules[$task->module] . "(#$task->module)";
if(isset($users[$task->openedBy])) $task->openedBy = $users[$task->openedBy];
if(isset($users[$task->assignedTo])) $task->assignedTo = $users[$task->assignedTo];