diff --git a/module/story/js/create.js b/module/story/js/create.js index 98059117c3..a5b95f195e 100644 --- a/module/story/js/create.js +++ b/module/story/js/create.js @@ -110,15 +110,15 @@ $(window).unload(function(){ }); /** - * Add item + * Add branch box. * * @param obj $obj * @access public * @return void */ - function addItem(obj) + function addBranchesBox(obj) { - var item = $('#addItem').html().replace(/%i%/g, itemIndex); + var item = $('#addBranchesBox').html().replace(/%i%/g, itemIndex); $(obj).closest('tr').after('' + item + ''); $('#branch_i__chosen').remove(); $('#branch' + itemIndex).chosen(); @@ -131,13 +131,13 @@ $(window).unload(function(){ } /** - * Delete item. + * Delete branch box. * * @param obj $obj * @access public * @return void */ - function deleteItem(obj) + function deleteBranchesBox(obj) { $(obj).closest('tr').remove(); } diff --git a/module/story/lang/de.php b/module/story/lang/de.php index 6257273ae5..8209fbf211 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -466,12 +466,6 @@ $lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed; $lang->story->featureBar['browse']['draft'] = $lang->story->statusList['draft']; $lang->story->featureBar['browse']['reviewing'] = $lang->story->statusList['reviewing']; -$lang->story->branchBox = new stdClass(); -$lang->story->branchBox->branch = 'branch'; -$lang->story->branchBox->sourceBranch = 'branch'; -$lang->story->branchBox->sourceModule = 'module'; -$lang->story->branchBox->sourcePlan = 'plan'; - $lang->requirement->common = $lang->URCommon; $lang->requirement->create = 'Create Requirement'; $lang->requirement->batchCreate = "Batch Create"; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index d68e4b688a..dbb5d44d16 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -466,12 +466,6 @@ $lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed; $lang->story->featureBar['browse']['draft'] = $lang->story->statusList['draft']; $lang->story->featureBar['browse']['reviewing'] = $lang->story->statusList['reviewing']; -$lang->story->branchBox = new stdClass(); -$lang->story->branchBox->branch = 'branch'; -$lang->story->branchBox->sourceBranch = 'branch'; -$lang->story->branchBox->sourceModule = 'module'; -$lang->story->branchBox->sourcePlan = 'plan'; - $lang->requirement->common = $lang->URCommon; $lang->requirement->create = 'Create Requirement'; $lang->requirement->batchCreate = "Batch Create"; diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index 4ef9444e41..cf5f0c0ac0 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -466,12 +466,6 @@ $lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed; $lang->story->featureBar['browse']['draft'] = $lang->story->statusList['draft']; $lang->story->featureBar['browse']['reviewing'] = $lang->story->statusList['reviewing']; -$lang->story->branchBox = new stdClass(); -$lang->story->branchBox->branch = 'branch'; -$lang->story->branchBox->sourceBranch = 'branch'; -$lang->story->branchBox->sourceModule = 'module'; -$lang->story->branchBox->sourcePlan = 'plan'; - $lang->requirement->common = $lang->URCommon; $lang->requirement->create = 'Create Requirement'; $lang->requirement->batchCreate = "Batch Create"; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 8a26690c57..0ec66c579d 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -466,12 +466,6 @@ $lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed; $lang->story->featureBar['browse']['draft'] = $lang->story->statusList['draft']; $lang->story->featureBar['browse']['reviewing'] = $lang->story->statusList['reviewing']; -$lang->story->branchBox = new stdClass(); -$lang->story->branchBox->branch = '分支'; -$lang->story->branchBox->sourceBranch = '所属分支'; -$lang->story->branchBox->sourceModule = '所属模块'; -$lang->story->branchBox->sourcePlan = '所属计划'; - $lang->requirement->common = $lang->URCommon; $lang->requirement->create = "提{$lang->URCommon}"; $lang->requirement->batchCreate = "批量创建"; diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 81f098280e..861e4b17f7 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -86,53 +86,32 @@ foreach(explode(',', $config->story->create->requiredFields) as $field) - story->branchBox->branch;?> + product->branchName[$product->type];?>
- story->branchBox->sourceBranch?> + product->branch, $lang->product->branchName[$product->type])?>
- story->branchBox->sourceModule?> - "; - echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=story¤tModuleID=0&branch=$branch", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='90%'"); - echo '  '; - echo html::a("javascript:void(0)", $lang->refreshIcon, '', "class='refresh' title='refresh' onclick='loadProductModules($productID)'"); - echo '
'; - } - ?> + story->module?> +
- story->branchBox->sourcePlan;?> - "; - echo html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch", '', true), "", '', "class='btn btn-icon' data-toggle='modal' data-type='iframe' data-width='95%' title='{$lang->productplan->create}'"); - echo '
'; - echo "
"; - echo html::a("javascript:void(0)", "", '', "class='btn btn-icon refresh' data-toggle='tooltip' title='{$lang->refresh}' onclick='loadProductPlans($productID)'"); - echo '
'; - } - ?> + story->plan;?> +
- +
@@ -367,55 +346,34 @@ foreach(explode(',', $config->story->create->requiredFields) as $field) - + @@ -428,7 +386,6 @@ $(function(){parent.$('body.hide-modal-close').removeClass('hide-modal-close');} var gap = $('#assignedTo').parent().parent().width(); $('#planBox').css('flex', '0 0 ' + gap + 'px') -// $('.c-actions').css('flex', '0 0 60px') $("#branches0").parent().parent().css('flex', '1 0 160px') $("#modules0").parent().parent().css('flex', '1 0 160px')