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

Merge branch 'sprint/zentaopms230' into '230'

Browse Source 
# Conflicts:
#   module/task/control.php
This commit is contained in:
王怡栋
2022-08-26 06:39:53 +00:00
parent a27dc9a3f2 098e89233d
commit 662f428288
4 changed files with 101 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
-14
View File
@@ -1339,20 +1339,6 @@ class task extends control
$task->myConsumed = 0;
$currentTeam = $this->task->getTeamByAccount($task->team);
if($currentTeam) $task->myConsumed = $currentTeam->consumed;
$task->nextBy = $this->task->getAssignedTo4Multi($members, $task);
$task->myConsumed = isset($task->team[$this->app->user->account]) ? $task->team[$this->app->user->account]->consumed : 0;
$lastAccount = end($task->members);
$finishedUsers = $this->task->getFinishedUsers($taskID, $task->members);
if(($lastAccount != $task->assignedTo and $task->mode == 'linear') or ($task->mode == 'multi' and count($task->members) != count($finishedUsers)))
{
$members = $this->task->getMemberPairs($task);
}
else
{
$task->nextBy = $task->openedBy;
}
}
$this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->task->finish;