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

Merge branch 'sgm_projectpriv' into 'master'

Browse Source 
* Reset project priv.

See merge request easycorp/zentaopms!979
This commit is contained in:
李玉春
2021-12-17 03:03:39 +00:00
parent 10dfc32924 6ee1345b07
commit 43d07b8cd0
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+2
View File
@@ -2110,6 +2110,8 @@ EOD;
if(isset($this->app->user))
{
if(in_array($module, $this->config->programPriv->waterfall)) return true;
$this->app->user = $this->session->user;
if(!commonModel::hasPriv($module, $method)) $this->deny($module, $method);
}
module/project/model.php
+7 -6
View File
@@ -127,12 +127,6 @@ class projectModel extends model
if($projectID and strpos(",{$this->app->user->view->projects},", ",{$this->session->project},") === false and !empty($projects)) $this->accessDenied();
}
/* Reset program priv. */
$moduleName = $this->app->getModuleName();
$methodName = $this->app->getMethodName();
$this->loadModel('common')->resetProjectPriv($this->session->project);
if(!$this->common->isOpenMethod($moduleName, $methodName) and !commonModel::hasPriv($moduleName, $methodName)) $this->common->deny($moduleName, $methodName, false);
return $this->session->project;
}
@@ -2080,6 +2074,13 @@ class projectModel extends model
}
$this->lang->switcherMenu = $this->getSwitcher($objectID, $this->app->rawModule, $this->app->rawMethod);
/* Reset project priv. */
$moduleName = $this->app->getModuleName();
$methodName = $this->app->getMethodName();
$this->loadModel('common')->resetProjectPriv($objectID);
if(!$this->common->isOpenMethod($moduleName, $methodName) and !commonModel::hasPriv($moduleName, $methodName)) $this->common->deny($moduleName, $methodName, false);
common::setMenuVars('project', $objectID);
}
}