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

Merge branch 'sprint/173_lizhiqiang_16373' into 'sprint/170'

Browse Source 
*Finish bug #16363.

See merge request easycorp/zentaopms!491
This commit is contained in:
李玉春
2021-11-17 08:50:36 +00:00
parent 63edc9d1f9 1fb7da9222
commit 1863bf4024
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/model.php
+1 -1
View File
@@ -884,7 +884,7 @@ class productModel extends model
else
{
$this->config->product->search['fields']['branch'] = sprintf($this->lang->product->branch, $this->lang->product->branchName[$productInfo->type]);
$this->config->product->search['params']['branch']['values'] = array('' => '', '0' => $this->lang->branch->main) + $this->loadModel('branch')->getPairs($productID, 'noempty') + array('all' => $this->lang->branch->all);
$this->config->product->search['params']['branch']['values'] = array('' => '', '0' => $this->lang->branch->main) + $this->loadModel('branch')->getPairs($productID, 'noempty');
}
$this->loadModel('search')->setSearchParams($this->config->product->search);