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

Merge branch 'master_xieqiyu_27445' into 'master'

Browse Source 
* Fix bug#27445.

See merge request easycorp/zentaopms!5306
This commit is contained in:
王怡栋
2022-09-13 05:48:16 +00:00
parent 9b8f83adaf 638586bea2
commit 84b130e617
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/model.php
+3 -4
View File
@@ -111,8 +111,7 @@ class productModel extends model
}
$this->session->set('currentProductType', $currentProduct->type);
$executionID = ($isQaModule and $this->app->tab == 'execution') ? $extra : 0;
$output = '';
$output = '';
if(!empty($products))
{
$dropMenuLink = helper::createLink($isQaModule ? 'bug' : 'product', 'ajaxGetDropMenu', "objectID=$productID&module=$currentModule&method=$currentMethod&extra=$extra");
@@ -127,8 +126,8 @@ class productModel extends model
$this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$currentProduct->type]);
$this->lang->product->menu->settings['subMenu']->branch = str_replace('@branch@', $this->lang->product->branch, $this->lang->product->menu->settings['subMenu']->branch);
$branches = $this->loadModel('branch')->getPairs($productID, 'all', $executionID);
$branchName = isset($branches[$branch]) ? $branches[$branch] : $branches[0];
$branches = $this->loadModel('branch')->getPairs($productID, 'all');
$branchName = $branches[$branch];
if(!$isMobile)
{
$dropMenuLink = helper::createLink('branch', 'ajaxGetDropMenu', "objectID=$productID&branch=$branch&module=$currentModule&method=$currentMethod&extra=$extra");