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

Merge branch 'zentaopms_266_wangyuting' into 'master'

Browse Source 
* Fix bug.

See merge request easycorp/zentaopms!6446
This commit is contained in:
王怡栋
2022-12-02 02:47:20 +00:00
parent 8b7afb1bef e100ad058c
commit d1952c69b0
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+1 -3
View File
@@ -1427,7 +1427,6 @@ class project extends control
$queryID = ($type == 'bysearch') ? (int)$param : 0;
$actionURL = $this->createLink('project', 'build', "projectID=$projectID&type=bysearch&queryID=myQueryID");
$allExecutions = $this->loadModel('execution')->getByProject($projectID, 'all', '', true);
$devel = $project->model == 'waterfall' ? true : false;
$executions = $this->loadModel('execution')->getByProject($projectID, 'all', '', true, $devel);
$this->config->build->search['fields']['execution'] = $this->project->lang->executionCommon;
@@ -1488,8 +1487,7 @@ class project extends control
$this->view->projectID = $projectID;
$this->view->project = $project;
$this->view->products = $products;
$this->view->allExecutions = $allExecutions;
$this->view->executions = $executions;
$this->view->executions = $this->execution->getPairs();
$this->view->buildPairs = $this->loadModel('build')->getBuildPairs(0);
$this->view->type = $type;