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

* Finish task #4839.

Browse Source
This commit is contained in:
Yagami
2018-09-04 11:22:17 +08:00
parent f980d46fec
commit 59415f3441
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+15 -9
View File
@@ -976,14 +976,15 @@ class project extends control
exit;
}
$name = '';
$code = '';
$team = '';
$products = array();
$whitelist = '';
$acl = 'open';
$plan = new stdClass();
$productPlan = array();
$name = '';
$code = '';
$team = '';
$products = array();
$whitelist = '';
$acl = 'open';
$plan = new stdClass();
$productPlan = array();
$productPlans = array();
if($copyProjectID)
{
$copyProject = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($copyProjectID)->fetch();
@@ -993,6 +994,10 @@ class project extends control
$acl = $copyProject->acl;
$whitelist = $copyProject->whitelist;
$products = $this->project->getProducts($copyProjectID);
foreach($products as $product)
{
$productPlans[$product->id] = $this->loadModel('productplan')->getPairs($product->id);
}
}
if(!empty($planID))
@@ -1038,9 +1043,10 @@ class project extends control
$this->view->name = $name;
$this->view->code = $code;
$this->view->team = $team;
$this->view->projectID = $projectID;
$this->view->projectID = $projectID;
$this->view->products = $products;
$this->view->productPlan = array(0 => '') + $productPlan;
$this->view->productPlans = array(0 => '') + $productPlans;
$this->view->whitelist = $whitelist;
$this->view->copyProjectID = $copyProjectID;
$this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products));
module/project/view/create.html.php
+7
View File
@@ -118,6 +118,13 @@
<?php if(isset($plan) && !empty($plan->begin)):?>
<div class="col-sm-4" id="plan0"><?php echo html::select("plans[" . $plan->product . "]", $productPlan, $plan->id, "class='form-control chosen'");?></div>
<?php js::set('currentPlanID', $plan->id)?>
<?php elseif($copyProjectID):?>
<?php $i = 0;?>
<?php foreach($products as $product):?>
<?php $plans = zget($productPlans, $product->id, array(0 => ''));?>
<div class="col-sm-4" id="plan<?php echo $i;?>"><?php echo html::select("plans[" . $product->id . "]", $plans, $product->plan, "class='form-control chosen'");?></div>
<?php $i++;?>
<?php endforeach;?>
<?php else:?>
<div class="col-sm-4" id="plan0"><?php echo html::select("plans[]", $productPlan, '', "class='form-control chosen'");?></div>
<?php js::set('currentPlanID', '')?>