diff --git a/module/execution/control.php b/module/execution/control.php index 56bc1e018d..3d95dbd45b 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1680,7 +1680,8 @@ class execution extends control $projectID = $this->session->project; $project = $this->project->getById($projectID); $this->project->setMenu($projectID); - $this->view->project = $project; + $this->view->project = $project; + $allProjectsFromProject = $this->project->getPairsByModel($project->model, 0, 'noclosed', isset($projectID) ? $projectID : 0); } if(!$this->post->executionIDList) return print(js::locate($this->session->executionList, 'parent')); @@ -1714,11 +1715,13 @@ class execution extends control $rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $appendRdUsers, $this->config->maxCount); if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink; + $allProjects = $this->project->getPairsByModel('all', 0, 'noclosed', isset($projectID) ? $projectID : 0); + $this->view->title = $this->lang->execution->batchEdit; $this->view->position[] = $this->lang->execution->batchEdit; $this->view->executionIDList = $executionIDList; $this->view->executions = $executions; - $this->view->allProjects = $this->project->getPairsByModel($project->model, 0, 'noclosed', isset($projectID) ? $projectID : 0); + $this->view->allProjects = $this->app->tab == 'project' ? $allProjectsFromProject : $allProjects; $this->view->pmUsers = $pmUsers; $this->view->poUsers = $poUsers; $this->view->qdUsers = $qdUsers;