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

* fix bug #1313.

Browse Source
This commit is contained in:
wangyidong
2017-12-01 09:36:22 +08:00
parent fca246824a
commit 66e5d7f47a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+3 -1
View File
@@ -779,6 +779,7 @@ class task extends control
$task = $this->view->task;
$members = $this->loadModel('user')->getPairs('noletter');
$this->view->users = $members;
if(!empty($task->team))
{
$task->openedBy = $this->task->getNextUser(array_keys($task->team), $task->assignedTo);
@@ -789,7 +790,7 @@ class task extends control
$this->view->title = $this->view->project->name . $this->lang->colon .$this->lang->task->finish;
$this->view->position[] = $this->lang->task->finish;
$this->view->members = $members;
$this->display();
}
@@ -822,6 +823,7 @@ class task extends control
$this->view->title = $this->view->project->name . $this->lang->colon .$this->lang->task->pause;
$this->view->position[] = $this->lang->task->pause;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->display();
}
module/task/model.php
+1 -1
View File
@@ -1129,7 +1129,7 @@ class taskModel extends model
if(!empty($task->parent)) $task->parentName = $this->dao->findById($task->parent)->from(TABLE_TASK)->fetch('name');
$teams = $this->dao->select('*')->from(TABLE_TEAM)->where('task')->eq($taskID)->orderBy('order_desc')->fetchGroup('task', 'account');
foreach($teams as $key => $team) $teams[$key] = array_reverse($team);
foreach($teams as $key => $team) $teams[$key] = array_reverse($team, true);
$task->team = isset($teams[$taskID]) ? $teams[$taskID] : array();
foreach($children as $child) $child->team = isset($teams[$child->id]) ? $teams[$child->id] : array();