*Finish task #45545.
This commit is contained in:
@@ -54,7 +54,9 @@ function loadAll(productID)
|
||||
{
|
||||
$('#taskIdBox').innerHTML = '<select id="task"></select>'; // 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)
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
#product_chosen {border-right:1px solid #dcdcdc;}
|
||||
#branch_chosen>a {border-left:0px;}
|
||||
</style>
|
||||
<?php js::set('page', 'create');?>
|
||||
<?php js::set('holders', $lang->story->placeholder); ?>
|
||||
<?php js::set('blockID', $blockID); ?>
|
||||
<?php js::set('feedbackSource', $config->story->feedbackSource); ?>
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
*/
|
||||
?>
|
||||
<?php include './header.html.php';?>
|
||||
<?php js::set('page', 'edit')?>
|
||||
<?php js::set('oldProductID', $story->product);?>
|
||||
<?php js::set('parentStory', !empty($story->children));?>
|
||||
<?php js::set('moveChildrenTips', $lang->story->moveChildrenTips);?>
|
||||
|
||||
@@ -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');
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
?>
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/kindeditor.html.php';?>
|
||||
<?php js::set('page', 'create');?>
|
||||
<?php js::set('lblDelete', $lang->testcase->deleteStep);?>
|
||||
<?php js::set('lblBefore', $lang->testcase->insertBefore);?>
|
||||
<?php js::set('lblAfter', $lang->testcase->insertAfter);?>
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
?>
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/kindeditor.html.php';?>
|
||||
<?php js::set('page', 'edit');?>
|
||||
<?php js::set('lblDelete', $lang->testcase->deleteStep);?>
|
||||
<?php js::set('lblBefore', $lang->testcase->insertBefore);?>
|
||||
<?php js::set('lblAfter', $lang->testcase->insertAfter);?>
|
||||
|
||||
Reference in New Issue
Block a user