* Fix bug #20458,20369,20140,20373.

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';

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';

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,';
 

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,';
 

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>

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();
 });

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);

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();