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

Merge branch 'sprint/189_zhouxudong_53651' into 'master'

Browse Source 
Sprint/189 zhouxudong 53651

See merge request easycorp/zentaopms!3323
This commit is contained in:
孙广明
2022-05-11 05:51:12 +00:00
parent 5cd347ce80 c0886b850d
commit 622185aa65
6 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+3 -2
View File
@@ -1678,8 +1678,9 @@ class execution extends control
if($this->app->tab == 'project')
{
$projectID = $this->session->project;
$project = $this->project->getById($projectID);
$this->project->setMenu($projectID);
$this->view->project = $this->project->getById($projectID);
$this->view->project = $project;
}
if(!$this->post->executionIDList) return print(js::locate($this->session->executionList, 'parent'));
@@ -1717,7 +1718,7 @@ class execution extends control
$this->view->position[] = $this->lang->execution->batchEdit;
$this->view->executionIDList = $executionIDList;
$this->view->executions = $executions;
$this->view->allProjects = $this->project->getPairsByModel('all', 0, 'noclosed', isset($projectID) ? $projectID : 0);
$this->view->allProjects = $this->project->getPairsByModel($project->model, 0, 'noclosed', isset($projectID) ? $projectID : 0);
$this->view->pmUsers = $pmUsers;
$this->view->poUsers = $poUsers;
$this->view->qdUsers = $qdUsers;