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

Merge branch 'ticket_bug_366' into 'master'

Browse Source 
* Resolved feedback 2191.

See merge request easycorp/zentaopms!6963
This commit is contained in:
王怡栋
2023-02-15 07:26:56 +00:00
parent 051a5b4bd9 a767115e92
commit 9393ee5558
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+7 -5
View File
@@ -2464,6 +2464,12 @@ EOD;
if(isset($this->app->user))
{
if($this->app->tab == 'project')
{
$projectPrivs = $this->loadModel('project')->processProjectPrivs();
if(isset($projectPrivs->$module->$method)) return true;
}
$this->app->user = $this->session->user;
if(!commonModel::hasPriv($module, $method))
{
@@ -2659,11 +2665,7 @@ 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);
$this->session->set('user', $this->app->user);
}
if($program->auth == 'extend') $this->app->user->rights['rights'] = array_merge_recursive($programRightGroup, $rights);
if($program->auth == 'reset')
{
/* If priv way is reset, unset common program priv, and cover by program priv. */