Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/master_fixbug' into 'master'

Browse Source 
* Fix bug #21336,21296.

See merge request easycorp/zentaopms!2700
This commit is contained in:
王怡栋
2022-04-01 03:29:18 +00:00
parent 6952a16e84 b8aec834dd
commit dec6eba5b2
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/lang/en.php
+20 -1
View File
@@ -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';
module/user/control.php
+1
View File
@@ -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();