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

* Fix Bug #30616

Browse Source
This commit is contained in:
lanzongjun
2022-12-09 16:03:32 +08:00
parent c80e1cfbee
commit e6301a8ec3
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/build/control.php
View File

@@ -643,7 +643,10 @@ class build extends control
if($build->branch)
{
foreach(explode(',', $build->branch) as $branchID) $branches += array($branchID => $branchPairs[$branchID]);
foreach(explode(',', $build->branch) as $branchID)
{
if(isset($branchPairs[$branchID])) $branches += array($branchID => $branchPairs[$branchID]);
}
}
$this->config->product->search['fields']['branch'] = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);

2
module/build/model.php
View File

@@ -457,7 +457,7 @@ class buildModel extends model
->get();
$product = $this->loadModel('product')->getByID($build->product);
if(!empty($product) and $product->type != 'normal' and !isset($_POST['branch']))
if(!empty($product) and $product->type != 'normal' and !isset($_POST['branch']) and isset($_POST['product']))
{
$this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
dao::$errors['branch'] = sprintf($this->lang->error->notempty, $this->lang->product->branch);