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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289

Browse Source
This commit is contained in:
caoyanyi
2023-02-15 09:13:10 +08:00
parent 41ddc2562b 1f87384b9b
commit a3d9cda86b
24 changed files with 77 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+8 -3
View File
@@ -1220,8 +1220,9 @@ class commonModel extends model
}
else
{
$subModule = isset($dropMenuItem['subModule']) ? explode(',', $dropMenuItem['subModule']) : array();
if($subModule and in_array($currentModule, $subModule) and strpos(",$exclude,", ",$currentModule-$currentMethod,") === false) $activeMainMenu = true;
$subModule = isset($dropMenuItem['subModule']) ? explode(',', $dropMenuItem['subModule']) : array();
$subExclude = isset($dropMenuItem['exclude']) ? $dropMenuItem['exclude'] : $exclude;
if($subModule and in_array($currentModule, $subModule) and strpos(",$subExclude,", ",$currentModule-$currentMethod,") === false) $activeMainMenu = true;
}
if($activeMainMenu)
@@ -2659,7 +2660,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. */