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

Merge branch 'pailei_zhangzilong_49297' into 'pailei'

Browse Source 
* Finish task #49297.

See merge request easycorp/zentaopms!2029
This commit is contained in:
孙广明
2022-03-02 03:00:45 +00:00
parent 5decf2cf6c 92f4d32a68
commit b63fa55607
6 changed files with 65 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+10 -3
View File
@@ -2055,12 +2055,15 @@ class execution extends control
$productID = 0;
$branchID = 0;
$products = $this->loadModel('product')->getProducts($executionID);
$productNames = array();
if($products)
{
$productID = key($products);
$branches = $this->loadModel('branch')->getPairs($productID, '', $executionID);
if($branches) $branchID = key($branches);
}
foreach($products as $product) $productNames[$product->id] = $product->name;
$plans = $this->execution->getPlans($products, 'skipParent', $executionID);
$allPlans = array('' => '');
@@ -2073,11 +2076,14 @@ class execution extends control
$this->view->users = $users;
$this->view->regions = $kanbanData;
$this->view->execution = $execution;
$this->view->executionID = $executionID;
$this->view->userList = $userList;
$this->view->browseType = $browseType;
$this->view->orderBy = $orderBy;
$this->view->groupBy = $groupBy;
$this->view->productID = $productID;
$this->view->productNames = $productNames;
$this->view->productNum = count($products);
$this->view->branchID = $branchID;
$this->view->projectID = $this->loadModel('task')->getProjectID($execution->id);
$this->view->allPlans = $allPlans;
@@ -2130,10 +2136,11 @@ class execution extends control
$canBeChanged = common::canModify('execution', $execution);
/* Get execution's product. */
$productID = 0;
$products = $this->loadModel('product')->getProducts($executionID);
foreach($products as $product) $productNames[$product->id] = $product->name;
$productID = 0;
$productNames = array();
$products = $this->loadModel('product')->getProducts($executionID);
if($products) $productID = key($products);
foreach($products as $product) $productNames[$product->id] = $product->name;
$plans = $this->execution->getPlans($products);
$allPlans = array('' => '');