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

* Fix bug #45262, and optimize code.

Browse Source
This commit is contained in:
liumengyi
2024-01-25 15:50:01 +08:00
parent 61e7ac482f
commit 2806a53a2c
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zin/wg/productsbox/v1.php
+2 -2
View File
@@ -41,7 +41,7 @@ class productsBox extends wg
list($project, $productItems, $linkedProducts) = $this->prop(array('project', 'productItems', 'linkedProducts'));
$productsBox = array();
if(!empty($project->hasProduct) && $linkedProducts)
if((!empty($project->hasProduct) || is_null($project)) && $linkedProducts)
{
$productsBox = $this->buildLinkedProducts($linkedProducts);
}
@@ -226,7 +226,7 @@ class productsBox extends wg
if(isset($planGroups[$product->id][$branchID])) $plans += $planGroups[$product->id][$branchID];
}
}
$planID = isset($product->plans) ? implode(',', $product->plans) : '';
$planID = isset($product->plans) && is_array($product->plans)? implode(',', $product->plans) : '';
}
else
{
module/project/zen.php
+11 -4
View File
@@ -254,7 +254,7 @@ class projectZen extends project
parse_str($extra, $output);
if($this->app->tab == 'program' && $programID) common::setMenuVars('program', $programID);
if($this->app->tab == 'product' && !empty($output['productID'])) $this->loadModel('product')->setMenu($output['productID']);
if($this->app->tab == 'product' && !empty($output['productID'])) $this->product->setMenu($output['productID']);
if($this->app->tab == 'doc') unset($this->lang->doc->menu->project['subMenu']);
if($copyProjectID) $copyProject = $this->getCopyProject((int)$copyProjectID);
@@ -273,12 +273,19 @@ class projectZen extends project
$withProgram = $this->config->systemMode == 'ALM';
$allProducts = $this->program->getProductPairs($programID, 'all', 'noclosed', '', $shadow, $withProgram);
$parentProgram = $this->loadModel('program')->getByID($programID);
$parentProgram = $this->program->getByID($programID);
if($copyProjectID)
{
$copyProjectBranches = $this->project->getBranchesByProject($copyProjectID);
$linkedProducts = $this->product->getProducts($copyProjectID, 'all', '', true, $copyProjectBranches, false);
$linkedBranches = $this->project->getBranchesByProject($copyProjectID);
}
else
{
$linkedProducts = $linkedBranches = array();
if(!empty($output['productID'])) $linkedProducts = array($output['productID'] => $this->product->getByID((int)$output['productID']));
if(isset($output['branchID'])) $linkedBranches = array($output['branchID'] => $output['branchID']);
}
$productPlans = $this->loadModel('productplan')->getGroupByProduct(array_keys($allProducts), 'skipparent|unexpired');
foreach($productPlans as $productID => $branchPlans)
@@ -309,8 +316,8 @@ class projectZen extends project
$this->view->budgetUnitList = $this->project->getBudgetUnitList();
$this->view->branchGroups = $this->loadModel('execution')->getBranchByProduct(array_keys($allProducts));
$this->view->productPlans = $productPlans;
$this->view->linkedProducts = isset($linkedProducts) ? $linkedProducts : array();
$this->view->linkedBranches = $this->project->getBranchesByProject($copyProjectID);
$this->view->linkedProducts = $linkedProducts;
$this->view->linkedBranches = $linkedBranches;
$this->view->isStage = in_array($model, array('waterfall', 'waterfallplus', 'ipd'));
$this->view->groups = $this->loadModel('group')->getPairs();
$this->display();