diff --git a/module/bug/js/common.js b/module/bug/js/common.js index a4e7a32948..833fc7a4c8 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -54,7 +54,9 @@ function loadAll(productID) { $('#taskIdBox').innerHTML = ''; // Reset the task. $('#task').chosen(); - loadProductBranches(productID) + var param = ''; + if(page == 'create') param = 'active'; + loadProductBranches(productID, param) } } @@ -521,13 +523,13 @@ function setStories(moduleID, productID, storyID) * @access public * @return void */ -function loadProductBranches(productID) +function loadProductBranches(productID, param) { $('#branch').remove(); $('#branch_chosen').remove(); $('#branch').next('.picker').remove(); - var param = (typeof(tab) != 'undefined' && (tab == 'execution' || tab == 'project')) ? "productID=" + productID + "&oldBranch=0¶m=&projectID=" + objectID : "productID=" + productID; + var param = (typeof(tab) != 'undefined' && (tab == 'execution' || tab == 'project')) ? "productID=" + productID + "&oldBranch=0¶m=" + param + "&projectID=" + objectID : "productID=" + productID; $.get(createLink('branch', 'ajaxGetBranches', param), function(data) { if(data) diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 3cce00ae90..5fa2732c73 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -15,6 +15,7 @@ #product_chosen {border-right:1px solid #dcdcdc;} #branch_chosen>a {border-left:0px;} + story->placeholder); ?> story->feedbackSource); ?> diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index f00c2eba62..6f222e95cd 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -11,6 +11,7 @@ */ ?> + product);?> children));?> story->moveChildrenTips);?> diff --git a/module/story/view/header.html.php b/module/story/view/header.html.php index 7701d588a8..5eabd8ec59 100644 --- a/module/story/view/header.html.php +++ b/module/story/view/header.html.php @@ -63,9 +63,11 @@ function loadBranch() */ function loadProductBranches(productID) { + var param = ''; + if(page == 'create') param = 'active'; $('#branch').remove(); $('#branch_chosen').remove(); - $.get(createLink('branch', 'ajaxGetBranches', "productID=" + productID + "&oldBranch=0¶m=&projectID=" + executionID), function(data) + $.get(createLink('branch', 'ajaxGetBranches', "productID=" + productID + "&oldBranch=0¶m=" + param + "&projectID=" + executionID), function(data) { var $product = $('#product'); var $inputGroup = $product.closest('.input-group'); diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js index c827dac166..42e1af966e 100644 --- a/module/testcase/js/common.js +++ b/module/testcase/js/common.js @@ -47,8 +47,10 @@ function loadBranch() */ function loadProductBranches(productID) { + var param = ''; + if(page == 'create') param = 'active'; $('#branch').remove(); - var param = (typeof(tab) != 'undefined' && (tab == 'execution' || tab == 'project')) ? "productID=" + productID + "&oldBranch=0¶m=&projectID=" + objectID : "productID=" + productID; + var param = (typeof(tab) != 'undefined' && (tab == 'execution' || tab == 'project')) ? "productID=" + productID + "&oldBranch=0¶m=" + param + "&projectID=" + objectID : "productID=" + productID; $.get(createLink('branch', 'ajaxGetBranches', param), function(data) { if(data) diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index 8f0cbbb642..74621a5539 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -12,6 +12,7 @@ ?> + testcase->deleteStep);?> testcase->insertBefore);?> testcase->insertAfter);?> diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index 85d6a14665..ca6d349c47 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -12,6 +12,7 @@ ?> + testcase->deleteStep);?> testcase->insertBefore);?> testcase->insertAfter);?>