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

Merge branch 'sprint/pailei2_zhouxudong_20832' into 'pailei2'

Browse Source 
* Fix bug #20832.

See merge request easycorp/zentaopms!2339
This commit is contained in:
李玉春
2022-03-17 06:25:33 +00:00
parent 0542a65ed0 6b09aac4aa
commit 72b050e02e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+4 -2
View File
@@ -1617,6 +1617,8 @@ class execution extends control
$rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $execution->RD, $this->config->maxCount);
if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
$project = $this->project->getById($execution->project);
$this->view->title = $title;
$this->view->position = $position;
$this->view->executions = $executions;
@@ -1626,8 +1628,8 @@ class execution extends control
$this->view->qdUsers = $qdUsers;
$this->view->rdUsers = $rdUsers;
$this->view->users = $this->user->getPairs('nodeleted|noclosed');
$this->view->allProjects = $this->project->getPairsByModel('all', 0, 'noclosed');
$this->view->project = $this->project->getById($execution->project);
$this->view->allProjects = $this->project->getPairsByModel($project->model, 0, 'noclosed');
$this->view->project = $project;
$this->view->groups = $this->loadModel('group')->getPairs();
$this->view->allProducts = $allProducts;
$this->view->linkedProducts = $linkedProducts;