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

* finish task #3727.

Browse Source
This commit is contained in:
wangyidong
2018-03-16 15:51:14 +08:00
parent 87a0679cbf
commit 809c8d5eb2
8 changed files with 55 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+4 -6
View File
@@ -604,14 +604,11 @@ class project extends control
$storyBugs = $this->loadModel('bug')->getStoryBugCounts($storyIdList, $projectID);
$storyCases = $this->loadModel('testcase')->getStoryCaseCounts($storyIdList);
$plans = $this->project->getPlans($productID);
$plans = $this->project->getPlans($products);
$allPlans = array('' => '');
if(!empty($plans))
{
foreach($plans as $productID => $plan)
{
$allPlans = $allPlans + $plan;
}
foreach($plans as $productID => $plan) $allPlans += $plan;
}
/* Assign. */
@@ -1030,7 +1027,7 @@ class project extends control
$this->view->qdUsers = $this->user->getPairs('noclosed|nodeleted|qdfirst', $project->QD);
$this->view->rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $project->RD);
$this->view->groups = $this->loadModel('group')->getPairs();
$this->view->plans = $this->project->getPlans(array_keys($linkedProducts));
$this->view->plans = $this->project->getPlans($linkedProducts);
$this->view->allProducts = $allProducts;
$this->view->linkedProducts = $linkedProducts;
$this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($linkedProducts));
@@ -1294,6 +1291,7 @@ class project extends control
$this->view->project = $project;
$this->view->products = $products;
$this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products));
$this->view->planGroups = $this->project->getPlans($products);
$this->view->groups = $this->loadModel('group')->getPairs();
$this->view->actions = $this->loadModel('action')->getList('project', $projectID);
$this->view->users = $this->loadModel('user')->getPairs('noletter');