From 482196b2461891c576134d296ae9e9b8a48750ce Mon Sep 17 00:00:00 2001 From: liuhong Date: Fri, 21 Oct 2022 04:28:26 +0000 Subject: [PATCH] * Fix bug #24436. --- module/task/control.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/task/control.php b/module/task/control.php index c3255549d5..539f50d414 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -45,7 +45,7 @@ class task extends control parse_str($extra, $output); if(!empty($executionID)) $execution = $this->execution->getById($executionID); - $executions = $this->execution->getPairs(0, 'all', 'noclosed'); + $executions = $this->execution->getPairs(0, 'all', isset($execution) ? (!common::canModify('execution', $execution) ? 'noclosed' : '') : 'noclosed'); $executionID = $this->execution->saveState($executionID, $executions); $execution = $this->execution->getById($executionID); $this->execution->setMenu($executionID); @@ -294,7 +294,7 @@ class task extends control $executionAll = array(); if(!empty($projectID)) { - $executionList = $this->execution->getByProject($projectID, 'noclosed', 0, true); + $executionList = $this->execution->getByProject($projectID, 'all', 0, true); $project = $this->loadModel('project')->getByID($projectID); $replace = substr(current($executionList), 0, strpos(current($executionList), '/')); if(isset($project->model) and $project->model == 'waterfall')