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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
chenfeiCF
2015-10-30 10:59:09 +08:00
parent 125f4244bd e58fe08c46
commit 4b77b0faa0
15 changed files with 33 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/control.php
+2 -9
View File
@@ -338,15 +338,8 @@ class build extends control
$this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getForProducts(array($build->product => $build->product));
$this->config->product->search['params']['module']['values'] = $this->tree->getOptionMenu($build->product, $viewType = 'story', $startModuleID = 0);
$this->config->product->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $this->lang->story->statusList);
if($product->type == 'normal')
{
unset($this->config->product->search['fields']['branch']);
unset($this->config->product->search['params']['branch']);
}
else
{
$this->config->product->search['params']['branch']['values'] = array('' => '') + $this->loadModel('branch')->getPairs($product->id, 'noempty');
}
unset($this->config->product->search['fields']['branch']);
unset($this->config->product->search['params']['branch']);
$this->loadModel('search')->setSearchParams($this->config->product->search);
if($browseType == 'bySearch')