extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix not possible to add run permissions via group->access permissions

Browse Source
This commit is contained in:
nathangray 2018-09-13 10:20:07 -06:00
parent c93d7e524c
commit f5b9aa3992
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/inc/class.admin_acl.inc.php
View File

@ -350,9 +350,16 @@ class admin_acl
$acl = $GLOBALS['egw']->acl; $acl = $GLOBALS['egw']->acl;
if($location == 'run')
{
$right_list = array(1 => 'run');
}
else
{
$right_list = Api\Hooks::single(array('location' => 'acl_rights'), $app); $right_list = Api\Hooks::single(array('location' => 'acl_rights'), $app);
}
$current = (int)$acl->get_specific_rights_for_account($account_id,$location,$app); $current = (int)$acl->get_specific_rights_for_account($account_id,$location,$app);
foreach($right_list as $right => $name) foreach((array)$right_list as $right => $name)
{ {
$have_it = !!($current & $right); $have_it = !!($current & $right);
$set_it = !!($rights & $right); $set_it = !!($rights & $right);

6
admin/inc/class.admin_cmd_acl.inc.php
View File

@ -92,8 +92,12 @@ class admin_cmd_acl extends admin_cmd
function __tostring() function __tostring()
{ {
$rights = $this->rights; $rights = $this->rights;
$location = $this->location; $location = lang($this->location);
if($this->location == 'run')
{
$rights = lang('run');
}
$names = Api\Hooks::single(array( $names = Api\Hooks::single(array(
'location' => 'acl_rights' 'location' => 'acl_rights'
), $this->app); ), $this->app);