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

fixbug #17317

Browse Source
This commit is contained in:
sunjun
2022-03-21 14:08:52 +08:00
parent c68b7b1bb2
commit c470946d4e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/projectrelease/control.php
View File

@@ -51,7 +51,7 @@ class projectrelease extends control
$this->view->products = $this->products;
$this->view->product = $product;
$this->view->branches = (isset($product->type) and $product->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($productID);
$this->view->branches = (isset($product->type) and $product->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($productID, 'active');
$this->view->branch = $branch;
$this->view->project = $this->project->getByID($projectID);
}

2
module/projectrelease/js/common.js
View File

@@ -27,7 +27,7 @@ function loadBranches(productID)
{
$('#branch').remove();
$('#branch_chosen').remove();
$.get(createLink('branch', 'ajaxGetBranches', "productID=" + productID), function(data)
$.get(createLink('branch', 'ajaxGetBranches', "productID=" + productID + '&oldBranch=0&params=active'), function(data)
{
var $product = $('#product');
var $inputGroup = $product.closest('.input-group');