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

Merge branch 'sprint/170_songchenxuan_16411' into 'sprint/170'

Browse Source 
* Fix bug 16411.

See merge request easycorp/zentaopms!546
This commit is contained in:
孙广明
2021-11-19 02:36:47 +00:00
parent af1d122219 0a351a6280
commit 8ffbccc050
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/control.php
+3 -2
View File
@@ -16,6 +16,7 @@ class build extends control
*
* @param int $executionID
* @param int $productID
* @param int $projectID
* @access public
* @return void
*/
@@ -72,7 +73,7 @@ class build extends control
$productGroups = $this->loadModel('product')->getProducts($executionID);
$productID = $productID ? $productID : key($productGroups);
$branchGroups = $this->loadModel('project')->getBranchesByProject($executionID);
$branchPairs = $this->loadModel('branch')->getPairs($productID);
$branchPairs = $this->loadModel('branch')->getPairs($productID, 'active');
$branches = array();
$products = array();
@@ -81,7 +82,7 @@ class build extends control
{
foreach($branchGroups[$productID] as $branchID => $branch)
{
$branches[$branchID] = $branchPairs[$branchID];
if(isset($branchPairs[$branchID])) $branches[$branchID] = $branchPairs[$branchID];
}
}
module/build/js/common.js
+1 -1
View File
@@ -16,7 +16,7 @@ function loadBranches(productID)
}
executionID = $('#execution').val();
$.get(createLink('branch', 'ajaxGetBranches', 'productID=' + productID + '&oldBranch=0&param=&projectID=' + executionID), function(data)
$.get(createLink('branch', 'ajaxGetBranches', 'productID=' + productID + '&oldBranch=0&param=active&projectID=' + executionID), function(data)
{
if(data)
{