From f5b9aa3992f344a0409d3a028e4377c482f70b09 Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 13 Sep 2018 10:20:07 -0600 Subject: [PATCH] Fix not possible to add run permissions via group->access permissions --- admin/inc/class.admin_acl.inc.php | 11 +++++++++-- admin/inc/class.admin_cmd_acl.inc.php | 6 +++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/admin/inc/class.admin_acl.inc.php b/admin/inc/class.admin_acl.inc.php index c4a8460b27..d65e8fce16 100644 --- a/admin/inc/class.admin_acl.inc.php +++ b/admin/inc/class.admin_acl.inc.php @@ -350,9 +350,16 @@ class admin_acl $acl = $GLOBALS['egw']->acl; - $right_list = Api\Hooks::single(array('location' => 'acl_rights'), $app); + if($location == 'run') + { + $right_list = array(1 => 'run'); + } + else + { + $right_list = Api\Hooks::single(array('location' => 'acl_rights'), $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); $set_it = !!($rights & $right); diff --git a/admin/inc/class.admin_cmd_acl.inc.php b/admin/inc/class.admin_cmd_acl.inc.php index 9601df106c..8e29105a06 100644 --- a/admin/inc/class.admin_cmd_acl.inc.php +++ b/admin/inc/class.admin_cmd_acl.inc.php @@ -92,8 +92,12 @@ class admin_cmd_acl extends admin_cmd function __tostring() { $rights = $this->rights; - $location = $this->location; + $location = lang($this->location); + if($this->location == 'run') + { + $rights = lang('run'); + } $names = Api\Hooks::single(array( 'location' => 'acl_rights' ), $this->app);