From b99e04cab34daf420dcf7bc74ec4934adaea4836 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Tue, 1 Mar 2022 09:56:19 +0800 Subject: [PATCH 1/2] * Fix bug. --- db/zentao.sql | 2 +- module/story/control.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 5fdd025d31..e3bf243fa3 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -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'), diff --git a/module/story/control.php b/module/story/control.php index d157bf3530..1e2b22e969 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -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(); } From 99bc2331ca66f838d1b9277e0334bd62626cc9ab Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Tue, 1 Mar 2022 13:06:59 +0800 Subject: [PATCH 2/2] * Fix bug #49398,49392. --- extension/lite/dev/ext/lang/en/lite.php | 1 - extension/lite/dev/ext/lang/zh-cn/lite.php | 1 - extension/lite/task/ext/control/batchcreate.php | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/extension/lite/dev/ext/lang/en/lite.php b/extension/lite/dev/ext/lang/en/lite.php index fa9cdf79d7..3521a92056 100644 --- a/extension/lite/dev/ext/lang/en/lite.php +++ b/extension/lite/dev/ext/lang/en/lite.php @@ -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'; diff --git a/extension/lite/dev/ext/lang/zh-cn/lite.php b/extension/lite/dev/ext/lang/zh-cn/lite.php index 9ef59bcb45..176a623270 100644 --- a/extension/lite/dev/ext/lang/zh-cn/lite.php +++ b/extension/lite/dev/ext/lang/zh-cn/lite.php @@ -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'] = '消息'; diff --git a/extension/lite/task/ext/control/batchcreate.php b/extension/lite/task/ext/control/batchcreate.php index 5635763039..713dc26da6 100644 --- a/extension/lite/task/ext/control/batchcreate.php +++ b/extension/lite/task/ext/control/batchcreate.php @@ -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))