From 861ec58fcbb8faa09f963b1a3a0adf0e4b2c8d1f Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 21 Nov 2019 14:17:52 +0800
Subject: [PATCH 1/2]  * code for task #6566.

---
 config/zentaopms.php |  1 -
 db/update11.6.5.sql  |  1 +
 db/zentao.sql        | 19 -------------------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/config/zentaopms.php b/config/zentaopms.php
index d047cf9d26..bef43360ae 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -168,7 +168,6 @@ define('TABLE_WEBHOOK',       '`' . $config->db->prefix . 'webhook`');
 define('TABLE_LOG',           '`' . $config->db->prefix . 'log`');
 define('TABLE_SCORE',         '`' . $config->db->prefix . 'score`');
 define('TABLE_NOTIFY',        '`' . $config->db->prefix . 'notify`');
-define('TABLE_TRANSLATION',   '`' . $config->db->prefix . 'translation`');
 define('TABLE_DINGUSERID',    '`' . $config->db->prefix . 'dinguserid`');
 if(!defined('TABLE_LANG')) define('TABLE_LANG', '`' . $config->db->prefix . 'lang`');
 
diff --git a/db/update11.6.5.sql b/db/update11.6.5.sql
index e0c5f82d45..3174184644 100644
--- a/db/update11.6.5.sql
+++ b/db/update11.6.5.sql
@@ -5,3 +5,4 @@ CREATE TABLE `zt_dinguserid` (
   `userid` varchar(255) NOT NULL,
   UNIQUE KEY `webhook_account_userid` (`webhook`,`account`,`userid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+DROP TABLE IF EXISTS `zt_translation`;
diff --git a/db/zentao.sql b/db/zentao.sql
index 94809ef0f9..b5658c9e6d 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -784,25 +784,6 @@ CREATE TABLE IF NOT EXISTS `zt_testtask` (
   KEY `product` (`product`),
   KEY `build` (`build`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- DROP TABLE IF EXISTS `zt_translation`;
-CREATE TABLE IF NOT EXISTS `zt_translation` (
-  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
-  `lang` varchar(30) NOT NULL,
-  `module` varchar(30) NOT NULL,
-  `key` varchar(100) NOT NULL,
-  `value` text NOT NULL,
-  `referer` text NOT NULL,
-  `status` varchar(30) NOT NULL,
-  `translator` char(30) NOT NULL,
-  `translatedTime` datetime NOT NULL,
-  `reviewer` char(30) NOT NULL,
-  `reviewedTime` datetime NOT NULL,
-  `reason` text NOT NULL,
-  `version` varchar(20) NOT NULL,
-  `mode` varchar(20) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `lang_module_key_mode` (`lang`,`module`,`key`,`mode`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_todo`;
 CREATE TABLE IF NOT EXISTS `zt_todo` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,

From 7734d23fea71f6ca2064b81b0f1cc139882b56f0 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Thu, 21 Nov 2019 14:22:10 +0800
Subject: [PATCH 2/2] * fix border of input-group controls in task/create view.

---
 module/task/js/create.js | 47 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/module/task/js/create.js b/module/task/js/create.js
index bab42c0369..cfe731f691 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -1,21 +1,21 @@
 /**
- * Load module, stories and members. 
- * 
- * @param  int    $projectID 
+ * Load module, stories and members.
+ *
+ * @param  int    $projectID
  * @access public
  * @return void
  */
 function loadAll(projectID)
 {
-    loadModuleMenu(projectID); 
+    loadModuleMenu(projectID);
     loadProjectStories(projectID);
     loadProjectMembers(projectID);
 }
 
 /**
- * Load team members of the project. 
- * 
- * @param  int    $projectID 
+ * Load team members of the project.
+ *
+ * @param  int    $projectID
  * @access public
  * @return void
  */
@@ -37,9 +37,9 @@ function loadProjectMembers(projectID)
 }
 
 /**
- * Load stories of the project. 
- * 
- * @param  int    $projectID 
+ * Load stories of the project.
+ *
+ * @param  int    $projectID
  * @access public
  * @return void
  */
@@ -54,9 +54,9 @@ function loadProjectStories(projectID)
 }
 
 /**
- * Load module of the project. 
- * 
- * @param  int    $projectID 
+ * Load module of the project.
+ *
+ * @param  int    $projectID
  * @access public
  * @return void
  */
@@ -164,16 +164,16 @@ function setPreview()
 }
 
 /**
- * Set after locate. 
- * 
+ * Set after locate.
+ *
  * @access public
  * @return void
  */
 function setAfter()
 {
-    if($("#story").length == 0 || $("#story").select().val() == '') 
+    if($("#story").length == 0 || $("#story").select().val() == '')
     {
-        if($('input[value="continueAdding"]').attr('checked') == 'checked') 
+        if($('input[value="continueAdding"]').attr('checked') == 'checked')
         {
             $('input[value="toTaskList"]').attr('checked', 'checked');
         }
@@ -190,8 +190,8 @@ function setAfter()
 
 /**
  * Load stories.
- * 
- * @param  int    $projectID 
+ *
+ * @param  int    $projectID
  * @access public
  * @return void
  */
@@ -203,7 +203,7 @@ function loadStories(projectID)
 
 /**
  * load stories of module.
- * 
+ *
  * @access public
  * @return void
  */
@@ -317,7 +317,7 @@ function markTestStory()
 $(document).ready(function()
 {
     $('#pri').on('change', function()
-    {   
+    {
         var $select = $(this);
         var $selector = $select.closest('.pri-selector');
         var value = $select.val();
@@ -328,14 +328,14 @@ $(document).ready(function()
         $('#selectTestStoryBox').toggleClass('hidden', $(this).val() != 'test');
         toggleSelectTestStory();
     });
-    
+
     setStoryRelated();
     markTestStory();
 
     $('#selectAllUser').on('click', function()
     {
         var $assignedTo = $('#assignedTo');
-        if($assignedTo.attr('multiple')) 
+        if($assignedTo.attr('multiple'))
         {
             $assignedTo.children('option').attr('selected', 'selected');
             $assignedTo.trigger('chosen:updated');
@@ -372,6 +372,7 @@ $(document).ready(function()
             $('.team-group').addClass('hidden');
             $('#estimate').attr('readonly', false);
         }
+        $('#dataPlanGroup').fixInputGroup();
     });
 
     /* Init task team manage dialog */