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

Merge branch 'fixbug_zhouxin_18746' into 'master'

Browse Source 
* Fix bug #18746.

See merge request easycorp/zentaopms!2456
This commit is contained in:
孙广明
2022-03-22 09:14:26 +00:00
parent 9e75ac5fcc 89a56dc374
commit fd523bb183
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+4 -1
View File
@@ -1444,12 +1444,15 @@ class execution extends control
$rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', '', $this->config->maxCount);
if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
$this->loadModel('product');
$allProducts = $this->config->systemMode == 'classic' ? $this->product->getPairs('noclosed') : $this->product->getProductPairsByProject($projectID, 'noclosed');
$this->view->title = (($this->app->tab == 'execution') and ($this->config->systemMode == 'new')) ? $this->lang->execution->createExec : $this->lang->execution->create;
$this->view->position[] = $this->view->title;
$this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('execution', 'all') : '';
$this->view->executions = array('' => '') + $this->execution->getList($projectID);
$this->view->groups = $this->loadModel('group')->getPairs();
$this->view->allProducts = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($projectID, 'noclosed');
$this->view->allProducts = array(0 => '') + $allProducts;
$this->view->acl = $acl;
$this->view->plan = $plan;
$this->view->name = $name;