From b8aec834dd80cff63de0408d839a481ec1f30228 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Fri, 1 Apr 2022 10:56:35 +0800
Subject: [PATCH] * Fix bug #21296,21336.

---
 module/block/lang/en.php | 21 ++++++++++++++++++++-
 module/user/control.php  |  1 +
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 23ef2803cb..4d29bcd473 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -107,7 +107,25 @@ $lang->block->spent           = 'Has Been Spent';
 $lang->block->budget          = 'Budget';
 $lang->block->left            = 'Remain';
 
-$lang->block->default['waterfall']['project']['3']['title']  = 'Plan Gantt Chart';
+$lang->block->titleList['flowchart']      = 'Flow Chart';
+$lang->block->titleList['statistic']      = 'Statistic';
+$lang->block->titleList['recentproject']  = 'Recent Project';
+$lang->block->titleList['assigntome']     = 'Assign to me';
+$lang->block->titleList['projectteam']    = 'Project manpower input';
+$lang->block->titleList['project']        = 'Project List';
+$lang->block->titleList['dynamic']        = 'Dynamic';
+$lang->block->titleList['list']           = 'Todo List';
+$lang->block->titleList['contribute']     = 'Contribute';
+$lang->block->titleList['scrumoverview']  = 'Scrumoverview';
+$lang->block->titleList['scrumtest']      = 'Scrum Test';
+$lang->block->titleList['scrumlist']      = 'Scrum List';
+$lang->block->titleList['sprint']         = 'Sprint';
+$lang->block->titleList['projectdynamic'] = 'Project Dynamic';
+$lang->block->titleList['bug']            = 'Bug';
+$lang->block->titleList['case']           = 'Case';
+$lang->block->titleList['testtask']       = 'Test Task';
+
+$lang->block->default['waterfall']['project']['3']['title']  = "Plan Gantt Chart";
 $lang->block->default['waterfall']['project']['3']['block']  = 'waterfallgantt';
 $lang->block->default['waterfall']['project']['3']['source'] = 'project';
 $lang->block->default['waterfall']['project']['3']['grid']   = 8;
@@ -144,6 +162,7 @@ $lang->block->default['scrum']['project']['4']['grid']  = 4;
 $lang->block->default['scrum']['project']['5']['title'] = 'Dynamic';
 $lang->block->default['scrum']['project']['5']['block'] = 'projectdynamic';
 $lang->block->default['scrum']['project']['5']['grid']  = 4;
+$lang->block->default['kanban'] = $lang->block->default['scrum'];
 
 $lang->block->default['product']['1']['title'] = $lang->productCommon . ' Report';
 $lang->block->default['product']['1']['block'] = 'statistic';
diff --git a/module/user/control.php b/module/user/control.php
index cc5c85ac23..8179bfa963 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -560,6 +560,7 @@ 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();