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

* Modify the error code.

Browse Source
This commit is contained in:
tianshujie
2021-11-10 09:58:49 +08:00
parent 8174540183
commit fb7f493036
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+3 -3
View File
@@ -1387,12 +1387,12 @@ class execution extends control
$this->view->productID = $productID;
$this->view->projectID = $projectID;
$this->view->products = $products;
$this->view->multiBranchProducts = $this->loadModel('product')->getMultiBranchPairs();
$this->view->multiBranchProducts = $this->product->getMultiBranchPairs();
$this->view->productPlan = array(0 => '') + $productPlan;
$this->view->productPlans = array(0 => '') + $productPlans;
$this->view->whitelist = $whitelist;
$this->view->copyExecutionID = $copyExecutionID;
$this->view->branchGroups = isset($branchGroups) ? $branchGroups : $this->loadModel('branch')->getByProducts(array_keys($products), 'noclosed');
$this->view->branchGroups = isset($branchGroups) ? $branchGroups : $this->execution->getBranchByProduct(array_keys($products), $projectID);
$this->view->poUsers = $poUsers;
$this->view->pmUsers = $pmUsers;
$this->view->qdUsers = $qdUsers;
@@ -1545,7 +1545,7 @@ class execution extends control
$this->view->unmodifiableBranches = $unmodifiableBranches;
$this->view->multiBranchProducts = $this->loadModel('product')->getMultiBranchPairs();
$this->view->productPlans = $productPlans;
$this->view->branchGroups = $this->execution->getByProducts(array_keys($linkedProducts), $execution->project);
$this->view->branchGroups = $this->execution->getBranchByProduct(array_keys($linkedProducts), $execution->project);
$this->display();
}
module/execution/js/create.js
+1 -1
View File
@@ -81,7 +81,7 @@ $(function()
$('#submit').click(function()
{
var products = [];
var products = new Array();
var existedBranch = false;
/* Determine whether the products of the same branch are linked. */
module/execution/js/edit.js
+1 -1
View File
@@ -4,7 +4,7 @@ $().ready(function()
{
$('#products0').removeAttr("disabled");
$('#branch0').removeAttr("disabled");
var products = [];
var products = new Array();
var existedBranch = false;
/* Determine whether the products of the same branch are linked. */
module/execution/view/create.html.php
+1 -1
View File
@@ -135,7 +135,7 @@
<?php $i = 0;?>
<?php foreach($products as $product):?>
<?php foreach($linkedBranches[$product->id] as $branchID => $branch):?>
<?php $plans = $productPlans[$product->id][$branchID];?>
<?php $plans = isset($productPlans[$product->id][$branchID]) ? $productPlans[$product->id][$branchID] : array();?>
<div class="col-sm-4" id="plan<?php echo $i;?>"><?php echo html::select("plans[{$product->id}][$branchID]", $plans, $branches[$product->id][$branchID]->plan, "class='form-control chosen'");?></div>
<?php $i++;?>
<?php endforeach;?>
module/execution/view/edit.html.php
+1 -1
View File
@@ -151,7 +151,7 @@
<?php $i = 0;?>
<?php foreach($linkedProducts as $product):?>
<?php foreach($linkedBranches[$product->id] as $branchID => $branch):?>
<?php $plans = $productPlans[$product->id][$branchID];?>
<?php $plans = isset($productPlans[$product->id][$branchID]) ? $productPlans[$product->id][$branchID] : array();?>
<div class="col-sm-4" id="plan<?php echo $i;?>"><?php echo html::select("plans[{$product->id}][{$branchID}]", $plans, $branches[$product->id][$branchID]->plan, "class='form-control chosen'");?></div>
<?php $i++;?>
<?php endforeach;?>
module/project/js/create.js
+1 -1
View File
@@ -28,7 +28,7 @@ $(function()
$('#submit').click(function()
{
var products = [];
var products = new Array();
var existedBranch = false;
/* Determine whether the products of the same branch are linked. */
module/project/js/edit.js
+1 -1
View File
@@ -96,7 +96,7 @@ $(function()
$('#submit').click(function()
{
var products = [];
var products = new Array();
var existedBranch = false;
/* Determine whether the products of the same branch are linked. */
module/project/view/edit.html.php
+1 -1
View File
@@ -149,7 +149,7 @@
<?php $i = 0;?>
<?php foreach($linkedProducts as $product):?>
<?php foreach($linkedBranches[$product->id] as $branchID => $branch):?>
<?php $plans = $productPlans[$product->id][$branchID];?>
<?php $plans = isset($productPlans[$product->id][$branchID]) ? $productPlans[$product->id][$branchID] : array();?>
<div class="col-sm-4" id="plan<?php echo $i;?>" style="padding-right: 6px;"><?php echo html::select("plans[{$product->id}][{$branchID}]", $plans, $branches[$product->id][$branchID]->plan, "class='form-control chosen'");?></div>
<?php $i++;?>
<?php endforeach;?>