From 297cd23d7faa2605c18dc10ec70ba46516ace784 Mon Sep 17 00:00:00 2001
From: Aidan Saunders <aidan.saunders@squiffle.uk>
Date: Mon, 24 Jul 2023 18:07:07 +0100
Subject: [PATCH] Change path for acl entityrole form

---
 CRM/ACL/Form/EntityRole.php      | 9 ++++++++-
 CRM/Core/xml/Menu/Misc.xml       | 6 ++++++
 xml/schema/ACL/ACLEntityRole.xml | 8 ++++----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CRM/ACL/Form/EntityRole.php b/CRM/ACL/Form/EntityRole.php
index eb137544ba..4e1b41be51 100644
--- a/CRM/ACL/Form/EntityRole.php
+++ b/CRM/ACL/Form/EntityRole.php
@@ -24,7 +24,14 @@ class CRM_ACL_Form_EntityRole extends CRM_Admin_Form {
   public $submitOnce = TRUE;
 
   /**
-   * Build the form object.
+   * Explicitly declare the entity api name.
+   */
+  public function getDefaultEntity(): string {
+    return 'ACLEntityRole';
+  }
+
+  /**
+   * http://adminui.localhost/wp-admin/admin.php?page=CiviCRM&q=civicrm%2Facl%2Fentityrole&reset=1&action=add Build the form object.
    */
   public function buildQuickForm() {
     parent::buildQuickForm();
diff --git a/CRM/Core/xml/Menu/Misc.xml b/CRM/Core/xml/Menu/Misc.xml
index 5aad20becc..96584fc654 100644
--- a/CRM/Core/xml/Menu/Misc.xml
+++ b/CRM/Core/xml/Menu/Misc.xml
@@ -52,6 +52,12 @@
      <page_callback>CRM_ACL_Page_EntityRole</page_callback>
      <access_arguments>administer CiviCRM,access CiviCRM</access_arguments>
   </item>
+  <item>
+     <path>civicrm/acl/entityrole/edit</path>
+     <title>Assign Users to ACL Roles</title>
+     <page_callback>CRM_ACL_Form_EntityRole</page_callback>
+     <access_arguments>administer CiviCRM,access CiviCRM</access_arguments>
+  </item>>
   <item>
      <path>civicrm/file</path>
      <title>Browse Uploaded files</title>
diff --git a/xml/schema/ACL/ACLEntityRole.xml b/xml/schema/ACL/ACLEntityRole.xml
index b39c84d92d..c0dcf4a595 100644
--- a/xml/schema/ACL/ACLEntityRole.xml
+++ b/xml/schema/ACL/ACLEntityRole.xml
@@ -9,10 +9,10 @@
   <title>ACL Role Assignment</title>
   <titlePlural>ACL Role Assignments</titlePlural>
   <paths>
-    <add>civicrm/acl/entityrole?reset=1&amp;action=add</add>
-    <delete>civicrm/acl/entityrole?reset=1&amp;action=delete&amp;id=[id]</delete>
-    <update>civicrm/acl/entityrole?reset=1&amp;action=update&amp;id=[id]</update>
-    <browse>civicrm/acl</browse>
+    <add>civicrm/acl/entityrole/edit?reset=1&amp;action=add</add>
+    <delete>civicrm/acl/entityrole/edit?reset=1&amp;action=delete&amp;id=[id]</delete>
+    <update>civicrm/acl/entityrole/edit?reset=1&amp;action=update&amp;id=[id]</update>
+    <browse>civicrm/acl/entityrole</browse>
   </paths>
   <field>
     <name>id</name>
-- 
2.25.1