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

* Optimize build product drop-down logic.

Browse Source
This commit is contained in:
tianshujie
2023-06-09 13:27:52 +08:00
parent 1eae54c17b
commit ed5cbcc2fd
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+4 -4
View File
@@ -979,10 +979,10 @@ class execution extends control
/* Set the product drop-down and search fields. */
$productOption = array();
$branchOption = array();
$showBranch = false;
$showBranch = $this->loadModel('branch')->showBranch($productID);
if($execution->hasProduct)
{
list($productOption, $branchOption, $showBranch) = $this->executionZen->buildProductSwitcher($productID, $products);
list($productOption, $branchOption) = $this->executionZen->buildProductSwitcher($productID, $products);
unset($this->config->bug->search['fields']['product']);
unset($this->config->bug->search['params']['product']);
if($project->model != 'scrum')
@@ -1119,10 +1119,10 @@ class execution extends control
$execution = $this->execution->getByID($executionID);
$productOption = array();
$branchOption = array();
$showBranch = false;
$showBranch = $this->loadModel('branch')->showBranch($productID);
if($execution->hasProduct)
{
list($productOption, $branchOption, $showBranch) = $this->executionZen->buildProductSwitcher($productID, $products);
list($productOption, $branchOption) = $this->executionZen->buildProductSwitcher($productID, $products);
}
/* Load pager. */
module/execution/zen.php
+2 -5
View File
@@ -63,8 +63,8 @@ class executionZen extends execution
*/
protected function buildProductSwitcher(int $productID, array $products)
{
$showBranch = false;
$productOption = array();
$branchOption = array();
$programIdList = array();
if(count($products) > 1) $productOption[0] = $this->lang->product->all;
foreach($products as $productData) $programIdList[$productData->program] = $productData->program;
@@ -81,9 +81,6 @@ class executionZen extends execution
$product = $this->product->getById((int)$productID);
if($product and $product->type != 'normal')
{
/* Display of branch label. */
$showBranch = $this->loadModel('branch')->showBranch($productID);
/* Display status of branch. */
$branches = $this->branch->getList($productID, $executionID, 'all');
foreach($branches as $branchInfo)
@@ -91,6 +88,6 @@ class executionZen extends execution
$branchOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : '');
}
}
return array($productOption, $branchOption, $showBranch);
return array($productOption, $branchOption);
}
}