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

Merge branch 'sprint/194_tianshujie_55257' into 'master'

Browse Source 
Sprint/194 tianshujie 55257

See merge request easycorp/zentaopms!3594
This commit is contained in:
李玉春
2022-05-25 08:08:26 +00:00
parent 14ece79b3e 8e3068d9b5
commit b41cdeb6f4
19 changed files with 154 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+2 -2
View File
@@ -824,7 +824,7 @@ class task extends control
$this->loadModel('action');
foreach($tasks as $taskID => $task)
{
if(isset($muletipleTasks[$taskID]) and $task->assignedTo != $this->app->user->account) continue;
if(isset($muletipleTasks[$taskID]) and $task->assignedTo != $this->app->user->account and $task->mode == 'linear') continue;
if(isset($muletipleTasks[$taskID]) and !isset($muletipleTasks[$taskID][$this->post->assignedTo])) continue;
$changes = $this->task->assign($taskID);
@@ -1207,7 +1207,7 @@ class task extends control
}
$task = $this->view->task;
$members = $this->loadModel('user')->getTeamMemberPairs($task->execution, 'execution', 'nodeleted');
$members = $task->team ? $this->task->getMemberPairs($task) : $this->loadModel('user')->getTeamMemberPairs($task->execution, 'execution', 'nodeleted');
$task->nextBy = $task->openedBy;
$this->view->users = $members;