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

* Adjust the logic of the assigned to.

Browse Source
This commit is contained in:
hufangzhou
2020-11-03 17:26:51 +08:00
parent 4ea37d68a2
commit a13f8cd4c0
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+7 -2
View File
@@ -738,11 +738,16 @@ class task extends control
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
$users = $this->loadModel('user')->getPairs('noletter');
$members = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
$assignedTo = in_array(zget($this->app->user->account, $users), $members) === TRUE ? $this->app->user->account : '';
$this->view->title = $this->view->project->name . $this->lang->colon .$this->lang->task->start;
$this->view->position[] = $this->lang->task->start;
$this->view->members = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->users = $users;
$this->view->members = $members;
$this->view->assignedTo = $task->assignedTo == '' ? $assignedTo : $task->assignedTo;
$this->display();
}