Fold deprecated function into the only function that calls it

[civicrm-core.git] / xml / schema / ACL / EntityRole.xml

diff --git a/xml/schema/ACL/EntityRole.xml b/xml/schema/ACL/EntityRole.xml
index 80eaf5f10b1fd29e4da8bcabea10f06a6bad74c0..5d7958b729285ded56042edf7ebbd952abcf9d42 100644 (file)
--- a/xml/schema/ACL/EntityRole.xml
+++ b/xml/schema/ACL/EntityRole.xml
@@ -1,64 +1,69 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-    <base>CRM/ACL</base>
-    <class>EntityRole</class>
-    <name>civicrm_acl_entity_role</name>
-    <comment>Join table for Contacts and Groups to ACL Roles</comment>
+  <base>CRM/ACL</base>
+  <class>EntityRole</class>
+  <name>civicrm_acl_entity_role</name>
+  <comment>Join table for Contacts and Groups to ACL Roles</comment>
+  <add>1.6</add>
+  <field>
+    <name>id</name>
+    <type>int unsigned</type>
+    <title>Entity Role</title>
+    <required>true</required>
+    <comment>Unique table ID</comment>
     <add>1.6</add>
-    <field>
-        <name>id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>Unique table ID</comment>
-        <add>1.6</add>
-    </field>
-    <primaryKey>
-        <name>id</name>
-        <autoincrement>true</autoincrement>
-    </primaryKey>
-    <field>
-        <name>acl_role_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>Foreign Key to ACL Role (which is an option value pair and hence an implicit FK)</comment>
-        <add>1.6</add>
-    </field>
-    <field>
-        <name>entity_table</name>
-        <type>varchar</type>
-        <length>64</length>
-        <required>true</required>
-        <comment>Table of the object joined to the ACL Role (Contact or Group)</comment>
-        <add>1.6</add>
-    </field>
-    <field>
-        <name>entity_id</name>
-        <type>int unsigned</type>
-        <required>true</required>
-        <comment>ID of the group/contact object being joined</comment>
-        <add>1.6</add>
-    </field>
-    <dynamicForeignKey>
-        <idColumn>entity_id</idColumn>
-        <typeColumn>entity_table</typeColumn>
-        <add>1.6</add>
-    </dynamicForeignKey>
-    <field>
-       <name>is_active</name>
-       <type>boolean</type>
-       <comment>Is this property active?</comment>
-       <add>1.6</add>
-    </field>
-    <index>
-       <name>index_role</name>
-       <fieldName>acl_role_id</fieldName>
-       <add>1.6</add>
-    </index>
-    <index>
-       <name>index_entity</name>
-       <fieldName>entity_table</fieldName>
-       <fieldName>entity_id</fieldName>
-       <add>1.6</add>
-    </index>
+  </field>
+  <primaryKey>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+    <name>acl_role_id</name>
+    <title>ACL Role ID</title>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>Foreign Key to ACL Role (which is an option value pair and hence an implicit FK)</comment>
+    <add>1.6</add>
+  </field>
+  <field>
+    <name>entity_table</name>
+    <title>Entity Table</title>
+    <type>varchar</type>
+    <length>64</length>
+    <required>true</required>
+    <comment>Table of the object joined to the ACL Role (Contact or Group)</comment>
+    <add>1.6</add>
+  </field>
+  <field>
+    <name>entity_id</name>
+    <title>ACL Entity ID</title>
+    <type>int unsigned</type>
+    <required>true</required>
+    <comment>ID of the group/contact object being joined</comment>
+    <add>1.6</add>
+  </field>
+  <dynamicForeignKey>
+    <idColumn>entity_id</idColumn>
+    <typeColumn>entity_table</typeColumn>
+    <add>1.6</add>
+  </dynamicForeignKey>
+  <field>
+    <name>is_active</name>
+    <title>ACL Entity Role is Active</title>
+    <type>boolean</type>
+    <comment>Is this property active?</comment>
+    <add>1.6</add>
+  </field>
+  <index>
+    <name>index_role</name>
+    <fieldName>acl_role_id</fieldName>
+    <add>1.6</add>
+  </index>
+  <index>
+    <name>index_entity</name>
+    <fieldName>entity_table</fieldName>
+    <fieldName>entity_id</fieldName>
+    <add>1.6</add>
+  </index>
 </table>