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

Merge branch 'zentaopms_277'

Browse Source
This commit is contained in:
孙广明
2022-12-30 08:45:34 +08:00
parent 6df3f17c89 d43c6ea13f
commit 137953e0ae
53 changed files with 7295 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/execution/control.php
View File

@@ -2029,7 +2029,7 @@ class execution extends control
$productPlans = array(0 => '');
$linkedBranches = array();
$linkedBranchList = array();
$linkedProducts = $this->product->getProducts($executionID, 'all', '', true, $linkedProductIdList);
$linkedProducts = $this->product->getProducts($executionID, 'all', '', true, $linkedProductIdList, false);
$plans = $this->productplan->getGroupByProduct(array_keys($linkedProducts), 'skipParent|unexpired');
$executionStories = $this->project->getStoriesByProject($executionID);
@@ -2039,7 +2039,7 @@ class execution extends control
$linkedStoryIDList = array();
foreach($linkedProducts as $productID => $linkedProduct)
{
if(!isset($allProducts[$productID])) $allProducts[$productID] = $linkedProduct->name;
if(!isset($allProducts[$productID])) $allProducts[$productID] = $linkedProduct->deleted ? $linkedProduct->name . "({$this->lang->product->deleted})" : $linkedProduct->name;
$productPlans[$productID] = array();
foreach($branches[$productID] as $branchID => $branch)