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

Merge branch 'sprint/231_tianshujie_65808' into 'master'

Browse Source 
* Finish task #65808, #65807.

See merge request easycorp/zentaopms!5067
This commit is contained in:
李玉春
2022-08-23 08:26:36 +00:00
parent f814ff44fa 277ee237d9
commit 3e487df2b3
14 changed files with 127 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/common.js
+2 -1
View File
@@ -141,9 +141,10 @@ function loadBranches(product)
if($inputgroup.find('.chosen-container').size() >= 2) $inputgroup.find('.chosen-container:last').remove();
var projectID = (typeof(systemMode) != 'undefined' && systemMode == 'new') ? $('#project').val() : 0;
if(typeof(projectID) == 'undefined') projectID = 0;
var index = $inputgroup.find('select:first').attr('id').replace('products' , '');
$.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=&param=active&projectID=" + projectID + "&withMainBranch="), function(data)
$.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=&param=active&projectID=" + projectID + "&withMainBranch=true"), function(data)
{
if(data)
{