diff --git a/module/project/js/kanban.js b/module/project/js/kanban.js index b2cd1624e0..02e700afc0 100644 --- a/module/project/js/kanban.js +++ b/module/project/js/kanban.js @@ -197,7 +197,15 @@ $(function() $.extend({'closeModal':function(callback, location) { - kanbanModalTrigger.close(); + var ref = $('#triggerModal.modal').attr('ref'); + if(ref.indexOf('export') > 0 && ref.indexOf('kanban') > 0) + { + $('#triggerModal').modal('hide'); + } + else + { + kanbanModalTrigger.close(); + } if(callback && $.isFunction(callback)) callback(); }}); }); diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 896ddc3206..29566e99d3 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -181,6 +181,7 @@ $lang->story->lblChange = 'Change'; $lang->story->lblReview = 'Review'; $lang->story->lblActivate = 'Activate'; $lang->story->lblClose = 'Close'; +$lang->story->lblTBC = 'Task/Bug/Case'; $lang->story->checkAffection = 'Impact'; $lang->story->affectedProjects = '' . $lang->projectCommon; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 9c7d278411..db7c3e8fdb 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -181,6 +181,7 @@ $lang->story->lblChange = '变更需求'; $lang->story->lblReview = '评审需求'; $lang->story->lblActivate = '激活需求'; $lang->story->lblClose = '关闭需求'; +$lang->story->lblTBC = '任务Bug用例'; $lang->story->checkAffection = '影响范围'; $lang->story->affectedProjects = '影响的' . $lang->projectCommon; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index e022fc093e..a6256b73a1 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -39,7 +39,7 @@ $lang->task->confirmStoryChange = "Confirm Story Change"; $lang->task->progress = 'Progress'; $lang->task->progressTips = 'Cost/(Cost+Left)'; $lang->task->copy = 'Duplicate Task'; -$lang->task->undoneTask = 'Undone Task'; +$lang->task->waitTask = 'Wait Task'; $lang->task->common = 'Task'; $lang->task->id = 'ID'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 46eb851178..1750d84a9b 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -39,7 +39,7 @@ $lang->task->confirmStoryChange = "确认需求变动"; $lang->task->progress = '进度'; $lang->task->progressTips = '已消耗/(已消耗+剩余)'; $lang->task->copy = '复制任务'; -$lang->task->undoneTask = '未完成的任务'; +$lang->task->waitTask = '未开始的任务'; $lang->task->common = '任务'; $lang->task->id = '编号';