From 2d3c8464d3d0e44e4dea3154b30481784c877115 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Wed, 9 Mar 2022 10:20:46 +0800
Subject: [PATCH] * Fix bug #20458,20369,20140,20373.

---
 extension/lite/block/ext/lang/en/lite.php                   | 2 ++
 extension/lite/block/ext/lang/zh-cn/lite.php                | 2 ++
 extension/lite/common/ext/lang/en/lite.php                  | 1 +
 extension/lite/common/ext/lang/zh-cn/lite.php               | 1 +
 extension/lite/todo/ext/view/batchcreate.lite.html.hook.php | 2 --
 module/todo/js/batchcreate.js                               | 1 +
 module/todo/view/batchcreate.html.php                       | 3 +++
 module/user/control.php                                     | 2 --
 8 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/extension/lite/block/ext/lang/en/lite.php b/extension/lite/block/ext/lang/en/lite.php
index fbefe01a6d..2b2566c658 100644
--- a/extension/lite/block/ext/lang/en/lite.php
+++ b/extension/lite/block/ext/lang/en/lite.php
@@ -19,7 +19,9 @@ $lang->block->story = 'Target';
 
 $lang->block->storyCount = 'Target Count';
 
+/* unset contribute and projectteam. */
 unset($lang->block->default['full']['my']['9']);
+unset($lang->block->default['full']['my']['6']);
 
 $lang->block->default['full']['my']['5']['title']  = 'Kanban List';
 $lang->block->default['full']['my']['5']['block']  = 'scrumlist';
diff --git a/extension/lite/block/ext/lang/zh-cn/lite.php b/extension/lite/block/ext/lang/zh-cn/lite.php
index 9bd80e60a2..4c60831543 100644
--- a/extension/lite/block/ext/lang/zh-cn/lite.php
+++ b/extension/lite/block/ext/lang/zh-cn/lite.php
@@ -19,7 +19,9 @@ $lang->block->story = '目标';
 
 $lang->block->storyCount = '目标数';
 
+/* unset contribute and projectteam. */
 unset($lang->block->default['full']['my']['9']);
+unset($lang->block->default['full']['my']['6']);
 
 $lang->block->default['full']['my']['5']['title']  = '看板列表';
 $lang->block->default['full']['my']['5']['block']  = 'scrumlist';
diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php
index feec557208..d010fef107 100644
--- a/extension/lite/common/ext/lang/en/lite.php
+++ b/extension/lite/common/ext/lang/en/lite.php
@@ -68,6 +68,7 @@ $lang->my->menuOrder[5]  = 'index';
 $lang->my->menuOrder[10] = 'calendar';
 if($config->edition != 'open') $lang->my->menuOrder[11] = 'effort';
 $lang->my->menuOrder[20] = 'task';
+$lang->my->menuOrder[25] = 'contacts';
 
 $lang->my->dividerMenu = ',calendar,';
 
diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php
index 9012c1b61f..f6f3feccfd 100644
--- a/extension/lite/common/ext/lang/zh-cn/lite.php
+++ b/extension/lite/common/ext/lang/zh-cn/lite.php
@@ -68,6 +68,7 @@ $lang->my->menuOrder[5]  = 'index';
 $lang->my->menuOrder[10] = 'calendar';
 if($config->edition != 'open') $lang->my->menuOrder[11] = 'effort';
 $lang->my->menuOrder[20] = 'task';
+$lang->my->menuOrder[25] = 'contacts';
 
 $lang->my->dividerMenu = ',calendar,';
 
diff --git a/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php b/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php
index f9ced5a133..93373fe779 100644
--- a/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php
+++ b/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php
@@ -1,8 +1,6 @@
-<?php $html = '<div class="divider"></div><button id="closeModal" type="button" class="btn btn-link" data-dismiss="modal"><i class="icon icon-close"></i></button>';?>
 <script>
 $(function()
 {
     for(var index = 0; index <= 9; index++) $('#todoBatchAddForm').append(`<input type="hidden" name="vision[${index}]" id="vision[${index}]" value="lite">`);
-    $('#mainContent .main-header .pull-right.btn-toolbar').append(<?php echo json_encode($html)?>);
 });
 </script>
diff --git a/module/todo/js/batchcreate.js b/module/todo/js/batchcreate.js
index 31c002d1b4..04aef4a837 100644
--- a/module/todo/js/batchcreate.js
+++ b/module/todo/js/batchcreate.js
@@ -25,4 +25,5 @@ $(function()
         $('#todoBatchAddForm #switchDate').val(value);
     });
     $('.main-header #date').change();
+    parent.$('#triggerModal .modal-content .modal-header .close').hide();
 });
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index 75442634be..359b2effc7 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -96,8 +96,11 @@
     </table>
   </form>
 </div>
+<?php $html = '<div class="divider"></div><button id="closeModal" type="button" class="btn btn-link" data-dismiss="modal"><i class="icon icon-close"></i></button>';?>
 
 <script>
+$('#mainContent .main-header .pull-right.btn-toolbar').append(<?php echo json_encode($html)?>);
+
 var $form = $('#todoBatchAddForm').on('change', '.control-time-switch', function()
 {
     var $checkbox = $(this);
diff --git a/module/user/control.php b/module/user/control.php
index 896b0ae31f..d1e884cd53 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -526,7 +526,6 @@ class user extends control
 
         $groups = $this->dao->select('id, name, role')
             ->from(TABLE_GROUP)
-            ->where('vision')->eq($this->config->vision)
             ->fetchAll();
         $groupList = array('' => '');
         $roleGroup = array();
@@ -561,7 +560,6 @@ class user extends control
     {
         $groups = $this->dao->select('id, name, role')
             ->from(TABLE_GROUP)
-            ->where('vision')->eq($this->config->vision)
             ->fetchAll();
         $groupList = array('' => '');
         $roleGroup = array();