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

Merge branch 'sprint/217_liumengyi_fixbug' into 'master'

Browse Source 
* Fix bug #25554.

See merge request easycorp/zentaopms!4635
This commit is contained in:
王怡栋
2022-07-22 03:20:59 +00:00
parent 2be6c0bbcf 374ec6f55d
commit fc85ee539c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+3 -2
View File
@@ -1094,11 +1094,12 @@ class actionModel extends model
{
if(empty($this->app->user->rights['acls']['actions'])) return '';
$canViewPrograms = empty($this->app->user->view->programs) ? '0' : $this->app->user->view->programs;
foreach($this->app->user->rights['acls']['actions'] as $moduleName => $actions)
{
if(isset($this->lang->mainNav->$moduleName) and !empty($this->app->user->rights['acls']['views']) and !isset($this->app->user->rights['acls']['views'][$moduleName])) continue;
$canViewPrograms = $moduleName == 'program' ? "`objectID` in ({$this->app->user->view->programs}) and " : '';
$actionCondition .= "($canViewPrograms `objectType` = '$moduleName' and `action` " . helper::dbIN($actions) . ") or ";
$programQuery = $moduleName == 'program' ? "`objectID` in ($canViewPrograms) and " : '';
$actionCondition .= "($programQuery `objectType` = '$moduleName' and `action` " . helper::dbIN($actions) . ") or ";
}
$actionCondition = trim($actionCondition, 'or ');
}