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

* Fix the issue of creating build.

Browse Source
This commit is contained in:
tianshujie98
2020-12-04 10:30:44 +08:00
parent 2e7632cb40
commit c8a5eb24e4
11 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+8 -1
View File
@@ -2941,10 +2941,12 @@ class projectModel extends model
* @param array $products
* @param int $queryID
* @param string $actionURL
* @param array $projects
* @param string $type projectBuild
* @access public
* @return void
*/
public function buildProjectBuildSearchForm($products, $queryID, $actionURL)
public function buildProjectBuildSearchForm($products, $queryID, $actionURL, $projects = '', $type = '')
{
$this->loadModel('build');
@@ -2953,6 +2955,11 @@ class projectModel extends model
$this->config->build->search['actionURL'] = $actionURL;
$this->config->build->search['queryID'] = $queryID;
$this->config->build->search['params']['product']['values'] = $products;
if($type == 'projectBuild')
{
$this->config->build->search['fields']['project'] = $this->lang->projectCommon;
$this->config->build->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => array('' => '') + $projects);
}
$this->loadModel('search')->setSearchParams($this->config->build->search);
}