Merge branch 'sprint/170_tianshujie_16192' into 'sprint/170'
* Fix bug #16192. See merge request easycorp/zentaopms!415
This commit is contained in:
@@ -286,7 +286,7 @@ class product extends control
|
||||
$this->view->productName = $productName;
|
||||
$this->view->moduleID = $moduleID;
|
||||
$this->view->stories = $stories;
|
||||
$this->view->plans = $this->loadModel('productplan')->getPairs($productID, $branch, '', true);
|
||||
$this->view->plans = $this->loadModel('productplan')->getPairs($productID, $branch === 'all' ? '' : $branch, '', true);
|
||||
$this->view->productPlans = isset($productPlans) ? array(0 => '') + $productPlans : array();
|
||||
$this->view->summary = $this->product->summary($stories, $storyType);
|
||||
$this->view->moduleTree = $moduleTree;
|
||||
|
||||
Reference in New Issue
Block a user