From e9d2d7362a78e0943970adad31017acce718af8f Mon Sep 17 00:00:00 2001 From: liuhong Date: Tue, 14 Feb 2023 01:43:35 +0000 Subject: [PATCH] * Adjust code for feedback #2191 --- module/common/model.php | 6 +++++- module/user/model.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index c6c4974b34..7d7d62c7c3 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -2658,7 +2658,11 @@ EOD; if($this->app->user->account == $program->openedBy or $this->app->user->account == $program->PM) $program->auth = 'extend'; - if($program->auth == 'extend') $this->app->user->rights['rights'] = array_merge_recursive($programRightGroup, $rights); + if($program->auth == 'extend') + { + $this->app->user->rights['rights'] = array_merge_recursive($programRightGroup, $rights); + $this->session->set('user', $this->app->user); + } if($program->auth == 'reset') { /* If priv way is reset, unset common program priv, and cover by program priv. */ diff --git a/module/user/model.php b/module/user/model.php index 9a988937f3..eea5c31733 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -1109,7 +1109,7 @@ class userModel extends model ->leftJoin(TABLE_USERGROUP)->alias('t2')->on('t1.id = t2.`group`') ->leftJoin(TABLE_GROUPPRIV)->alias('t3')->on('t2.`group` = t3.`group`') ->where('t2.account')->eq($account) - ->beginIF($group->project != 0)->andWhere('t1.project')->eq($group->project) + ->andWhere('t1.project')->eq(0) ->andWhere('t1.vision')->eq($this->config->vision); }