From 85f9a45688fc0e7aff1d90ddecb19aebb1987659 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 1 Nov 2018 15:06:31 +0800
Subject: [PATCH]  * finish task #7017.

---
 module/project/js/kanban.js | 10 +++++++++-
 module/story/lang/en.php    |  1 +
 module/story/lang/zh-cn.php |  1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

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 99d032d358..417b505335 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;