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

Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'

Browse Source 
* Fix bug.

See merge request easycorp/zentaopms!2021
This commit is contained in:
王怡栋
2022-03-01 05:38:12 +00:00
parent d9215e06c7 99bc2331ca
commit fb1e105cbb
5 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/zentao.sql
+1 -1
View File
@@ -1750,7 +1750,7 @@ INSERT INTO `zt_group` (`id`, `name`, `role`, `desc`) VALUES
(13, 'PROJECTADMIN', 'projectAdmin', 'Project Admins manage project privileges');
INSERT INTO `zt_group` (`id`, `vision`, `name`, `role`, `desc`) VALUES
(14, 'lite', 'LITEUSER', 'liteUser', 'Normal user of lite vision');
(14, 'lite', '迅捷版用户分组', 'liteUser', '迅捷版用户分组');
INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
(1,'action','comment'),
extension/lite/dev/ext/lang/en/lite.php
-1
View File
@@ -76,7 +76,6 @@ $lang->dev->groupList['my'] = 'My';
$lang->dev->groupList['project'] = 'Project';
$lang->dev->groupList['execution'] = $lang->executionCommon;
$lang->dev->groupList['doc'] = 'Document';
$lang->dev->groupList['report'] = 'Report';
$lang->dev->groupList['company'] = 'Company';
$lang->dev->groupList['api'] = 'API';
$lang->dev->groupList['message'] = 'Message';
extension/lite/dev/ext/lang/zh-cn/lite.php
-1
View File
@@ -76,7 +76,6 @@ $lang->dev->groupList['my'] = '我的地盘';
$lang->dev->groupList['project'] = '项目';
$lang->dev->groupList['execution'] = $lang->executionCommon;
$lang->dev->groupList['doc'] = '文档';
$lang->dev->groupList['report'] = '统计';
$lang->dev->groupList['company'] = '组织';
$lang->dev->groupList['api'] = 'API';
$lang->dev->groupList['message'] = '消息';
extension/lite/task/ext/control/batchcreate.php
+1
View File
@@ -26,6 +26,7 @@ class myTask extends task
$this->view->regionID = $regionID;
}
$this->config->execution->task->allModule = 1;
$this->view->lanes = $lanes;
if(!empty($_POST))
module/story/control.php
+1 -1
View File
@@ -1695,7 +1695,7 @@ class story extends control
$this->view->position[] = $this->lang->story->assign;
$this->view->story = $story;
$this->view->actions = $this->action->getList('story', $storyID);
$this->view->users = $this->loadModel('user')->getTeamMemberPairs($this->session->project);
$this->view->users = ($this->config->vision == 'lite') ? $this->loadModel('user')->getTeamMemberPairs($this->session->project) : $this->loadModel('user')->getPairs('nodeleted|noclosed|pofirst|noletter');
$this->display();
}