Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug See merge request easycorp/zentaopms!6584
This commit is contained in:
@@ -320,7 +320,7 @@ function loadPlanForTwins(productID, branch, branchIndex)
|
||||
{
|
||||
/* Load plan */
|
||||
if(branch == '0') branch = '';
|
||||
planLink = createLink('product', 'ajaxGetPlans', 'productID=' + productID + '&branch=' + branch + '&planID=0&fieldID=' + branchIndex + '&needCreate=false&expired=unexpired¶m=skipParent|forStory,' + config.currentMethod);
|
||||
planLink = createLink('product', 'ajaxGetPlans', 'productID=' + productID + '&branch=' + branch + '&planID=0&fieldID=' + branchIndex + '&needCreate=false&expired=unexpired¶m=skipParent,forStory,' + config.currentMethod);
|
||||
if(branchIndex > 0)
|
||||
{
|
||||
var $planIdBox = $('.addBranchesBox'+ branchIndex +' #planIdBox');
|
||||
|
||||
@@ -216,7 +216,7 @@ function loadProductPlans(productID, branch)
|
||||
|
||||
var param = rawMethod == 'edit' ? 'skipParent|forStory' : 'skipParent';
|
||||
var expired = config.currentMethod == 'create' ? 'unexpired' : '';
|
||||
var planLink = createLink('product', 'ajaxGetPlans', 'productID=' + productID + '&branch=' + branch + '&planID=' + $('#plan').val() + '&fieldID=&needCreate=true&expired='+ expired +'¶m=skipParent|forStory|' + config.currentMethod);
|
||||
var planLink = createLink('product', 'ajaxGetPlans', 'productID=' + productID + '&branch=' + branch + '&planID=' + $('#plan').val() + '&fieldID=&needCreate=true&expired='+ expired +'¶m=skipParent,forStory,' + config.currentMethod);
|
||||
var $planIdBox = rawMethod == 'create' ? $('.switchBranch #planIdBox') : $('#planIdBox');
|
||||
|
||||
$planIdBox.load(planLink, function()
|
||||
|
||||
Reference in New Issue
Block a user