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

Merge branch 'fixbug_22007' into 'master'

Browse Source 
fixbug_22007

See merge request easycorp/zentaopms!4286
This commit is contained in:
孙广明
2022-07-01 00:15:12 +00:00
parent c168920eab 7882690c49
commit f04bcce5cf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+3 -3
View File
@@ -44,7 +44,8 @@ class task extends control
$extra = str_replace(array(',', ' '), array('&', ''), $extra);
parse_str($extra, $output);
$executions = $this->execution->getPairs(0, 'all', 'noclosed');
$execution = $this->execution->getById($executionID);
$executions = $this->execution->getPairs(0, 'all', !common::canModify('execution', $execution) ? 'noclosed' : '');
$executionID = $this->execution->saveState($executionID, $executions);
$this->execution->setMenu($executionID);
@@ -92,7 +93,6 @@ class task extends control
$task->assignedTo = array($bug->assignedTo);
}
$execution = $this->execution->getById($executionID);
$taskLink = $this->createLink('execution', 'browse', "executionID=$executionID&tab=task");
$this->loadModel('kanban');
@@ -283,7 +283,7 @@ class task extends control
$this->view->position = $position;
$this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('execution', 'task', "executionID=$executionID") : '';
$this->view->execution = $execution;
$this->view->executions = $this->config->systemMode == 'classic' ? $executions : $this->execution->getByProject($projectID, 'undone', 0, true);
$this->view->executions = $this->config->systemMode == 'classic' ? $executions : $this->execution->getByProject($projectID, !common::canModify('execution', $execution) ? 'noclosed' : 'all', 0, true);
$this->view->task = $task;
$this->view->users = $users;
$this->view->storyID = $storyID;