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

* adjust for review code.

Browse Source
This commit is contained in:
王怡栋
2021-10-09 09:29:10 +08:00
parent 88a5c5d207
commit 0fa52d3318
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+6 -9
View File
@@ -1972,13 +1972,13 @@ EOD;
}
/**
* Reset program priv.
* Reset project priv.
*
* @param int $projectID
* @access public
* @return void
*/
public function resetProgramPriv($projectID = 0)
public function resetProjectPriv($projectID = 0)
{
/* Get user program priv. */
if(empty($projectID) and $this->session->project) $projectID = $this->session->project;
@@ -2002,10 +2002,6 @@ EOD;
/* Reset priv by program privway. */
$rights = $this->app->user->rights['rights'];
$this->app->user = clone $_SESSION['user'];
if($projectID == '1649')
{
a($_SESSION['user']->rights['rights']['project']);
}
if($program->auth == 'extend') $this->app->user->rights['rights'] = array_merge_recursive($programRightGroup, $rights);
if($program->auth == 'reset')
@@ -2022,9 +2018,10 @@ EOD;
$recomputedRights = array_merge($rights, $programRightGroup);
/* Set base priv for project. */
if(isset($this->app->user->rights['rights']['project']['browse']) and !isset($recomputedRights['project']['browse'])) $recomputedRights['project']['browse'] = 1;
if(isset($this->app->user->rights['rights']['project']['kanban']) and !isset($recomputedRights['project']['kanban'])) $recomputedRights['project']['kanban'] = 1;
if(isset($this->app->user->rights['rights']['project']['index']) and !isset($recomputedRights['project']['index'])) $recomputedRights['project']['index'] = 1;
$projectRights = zget($this->app->user->rights['rights'], 'project', array());
if(isset($projectRights['browse']) and !isset($recomputedRights['project']['browse'])) $recomputedRights['project']['browse'] = 1;
if(isset($projectRights['kanban']) and !isset($recomputedRights['project']['kanban'])) $recomputedRights['project']['kanban'] = 1;
if(isset($projectRights['index']) and !isset($recomputedRights['project']['index'])) $recomputedRights['project']['index'] = 1;
$this->app->user->rights['rights'] = $recomputedRights;
}
module/compile/model.php
+1 -1
View File
@@ -146,7 +146,7 @@ class compileModel extends model
$this->loadModel('job');
if($job->engine == 'gitlab') $compile = $this->job->execGitlabPipeline($job, $compileID);
if($job->engine == 'jenkins') $compile = $this->job->execJenkinsPipeline($job, $repo, $compile->id);
if($job->engine == 'jenkins') $compile = $this->job->execJenkinsPipeline($job, $repo, $compileID);
$this->dao->update(TABLE_COMPILE)->data($compile)->where('id')->eq($compileID)->exec();
$this->dao->update(TABLE_JOB)
module/project/model.php
+1 -1
View File
@@ -129,7 +129,7 @@ class projectModel extends model
/* Reset program priv. */
$moduleName = $this->app->getModuleName();
$methodName = $this->app->getMethodName();
$this->loadModel('common')->resetProgramPriv($this->session->project);
$this->loadModel('common')->resetProjectPriv($this->session->project);
if(!commonModel::hasPriv($moduleName, $methodName)) $this->common->deny($moduleName, $methodName, false);
return $this->session->project;