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

Merge branch 'sprint/239_liuruogu_bug' into 'zentaopms_239'

Browse Source 
* Rollback.

See merge request easycorp/zentaopms!5479
This commit is contained in:
刘刚
2022-09-22 05:59:06 +00:00
parent b1944e6514 efec95dc83
commit e215513ebe
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/model.php
+3 -2
View File
@@ -1136,13 +1136,12 @@ class productModel extends model
$productIdList = ($this->app->tab == 'project' and empty($productID)) ? array_keys($products) : $productID;
$branchParam = ($this->app->tab == 'project' and empty($productID)) ? '' : $branch;
$projectID = ($this->app->tab == 'project' and empty($projectID)) ? $this->session->project : $projectID;
$productInfo = $this->getById($productID);
$this->config->product->search['actionURL'] = $actionURL;
$this->config->product->search['queryID'] = $queryID;
$this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productIdList, $branchParam);
$product = ($this->app->tab == 'project' and empty($productID)) ? $products : array($productID => $productInfo->name);
$product = ($this->app->tab == 'project' and empty($productID)) ? $products : array($productID => $products[$productID]);
$this->config->product->search['params']['product']['values'] = $product + array('all' => $this->lang->product->allProduct);
@@ -1188,6 +1187,8 @@ class productModel extends model
}
$this->config->product->search['params']['module']['values'] = array('' => '') + $modules;
$productInfo = $this->getById($productID);
if(!$productID or $productInfo->type == 'normal' or $this->app->tab == 'assetlib')
{
unset($this->config->product->search['fields']['branch']);