From 8a031d2ca41c498da0d02fb33d29f553be1c702c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 8 Apr 2021 10:45:52 +0800 Subject: [PATCH] * fix bug #11889. --- module/group/lang/resource.php | 3 ++- module/upgrade/model.php | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 486ea74f4f..d0ec07fa4e 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -78,7 +78,6 @@ $lang->resource->my->todo = 'todo'; $lang->resource->my->calendar = 'calendarAction'; $lang->resource->my->work = 'workAction'; $lang->resource->my->contribute = 'contributeAction'; -$lang->resource->my->project = 'project'; $lang->resource->my->profile = 'profileAction'; $lang->resource->my->uploadAvatar = 'uploadAvatar'; $lang->resource->my->preference = 'preference'; @@ -143,6 +142,8 @@ $lang->resource->todo->batchClose = 'batchClose'; global $config; if($config->systemMode == 'new') { + $lang->resource->my->project = 'project'; + /* Program. */ $lang->resource->program = new stdclass(); $lang->resource->program->browse = 'browse'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 60b318ae3f..1d1f65c4a5 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -3992,6 +3992,13 @@ class upgradeModel extends model $this->dao->replace(TABLE_GROUPPRIV)->data($groupPriv)->exec(); } + $stmt = $this->dao->select('`group`,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('my')->andWhere('method')->eq('project')->query(); + while($grouppriv = $stmt->fetch()) + { + $grouppriv->method = 'execution'; + $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec(); + } + $stmt = $this->dao->select('`group`,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('program')->andWhere('method')->like('PGM%')->query(); while($grouppriv = $stmt->fetch()) {