From f1de39ec1217db1360500384c92a64b99779244b Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 21 Jan 2021 19:07:41 -0800 Subject: [PATCH] Afform - Use API for listing/searching available permissions --- .../admin/Civi/AfformAdmin/AfformAdminMeta.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php b/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php index 468d690bdb..c2068cc189 100644 --- a/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php +++ b/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php @@ -216,11 +216,16 @@ class AfformAdminMeta { ]; $data['permissions'] = []; - foreach (\CRM_Core_Permission::basicPermissions(TRUE, TRUE) as $name => $perm) { + $perms = \Civi\Api4\Permission::get() + ->addWhere('group', 'IN', ['afformGeneric', 'const', 'civicrm', 'cms']) + ->addWhere('is_active', '=', 1) + ->setOrderBy(['group' => 'ASC', 'name' => 'ASC']) + ->execute(); + foreach ($perms as $perm) { $data['permissions'][] = [ - 'id' => $name, - 'text' => $perm[0], - 'description' => $perm[1] ?? NULL, + 'id' => $perm['name'], + 'text' => $perm['title'], + 'description' => $perm['description'] ?? NULL, ]; } -- 2.25.1