From d9c174f9211556d7873110fee934db6774641368 Mon Sep 17 00:00:00 2001 From: liuhong Date: Wed, 24 Aug 2022 01:09:11 +0000 Subject: [PATCH] *Fix bug #26725. --- module/execution/model.php | 3 +-- module/task/control.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/module/execution/model.php b/module/execution/model.php index 4c26b20bae..790f36e543 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1588,8 +1588,7 @@ class executionModel extends model if($projectsToAppended) { - $task = $this->dao->select('execution')->from(TABLE_TASK)->where('id')->eq($projectsToAppended)->fetch('execution'); - $path = sprintf("%s,%s", $projectID, $task); + $path = sprintf("%s,%s", $projectID, $projectsToAppended); $executions += $this->dao->select('*')->from(TABLE_EXECUTION)->where('path')->like("%,$path,%")->fetchAll('id'); } diff --git a/module/task/control.php b/module/task/control.php index 903b6c558d..a22df924b6 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -613,7 +613,7 @@ class task extends control $this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}"); $this->view->showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : ''; $this->view->modules = $this->tree->getTaskOptionMenu($this->view->task->execution, 0, 0, $this->view->showAllModule ? 'allModule' : ''); - $this->view->executions = $this->config->systemMode == 'classic' ? $this->execution->getPairs() : $this->execution->getByProject($task->project, 'noclosed', 0, true, false, $taskID); + $this->view->executions = $this->config->systemMode == 'classic' ? $this->execution->getPairs() : $this->execution->getByProject($task->project, 'noclosed', 0, true, false, $task->execution); $this->display(); }