projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e1092ab)
Revert "Add permission metadata to contact is_deleted field"
authorColeman Watts <coleman@civicrm.org>
Thu, 2 Dec 2021 01:34:49 +0000 (20:34 -0500)
committerColeman Watts <coleman@civicrm.org>
Thu, 2 Dec 2021 01:34:49 +0000 (20:34 -0500)
This reverts commit d2ff128ce0503dc1956f02c86035686ea016f10f.
ACLs for accessing deleted contacts are already enforced in the query,
so this field was being hidden for UI purposes not ACL purposes.
It had the unfortunate side-effect of crashing any API call using
`is_deleted` in the WHERE clause for non-permissioned users.

CRM/Contact/DAO/Contact.php patch | blob | blame | history
xml/schema/Contact/Contact.xml patch | blob | blame | history

diff --git a/CRM/Contact/DAO/Contact.php b/CRM/Contact/DAO/Contact.php
index 860e6e9c50f6442303988b65ed21ea5b037ef95d..a6bb970eea2c8e222e4150a8f8613550c9c63fba 100644 (file)
--- a/CRM/Contact/DAO/Contact.php
+++ b/CRM/Contact/DAO/Contact.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Contact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5a83ff9bd2a1837caa260151fa56f3ac)
+ * (GenCodeChecksum:5a410e3dd35c4d4b66fdeeacf1cfd971)
  */
 
 /**
@@ -1500,9 +1500,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO {
           'required' => TRUE,
           'where' => 'civicrm_contact.is_deleted',
           'export' => TRUE,
-          'permission' => [
-            'access deleted contacts',
-          ],
           'default' => '0',
           'table_name' => 'civicrm_contact',
           'entity' => 'Contact',
diff --git a/xml/schema/Contact/Contact.xml b/xml/schema/Contact/Contact.xml
index 59ee1a7cbdbfa124a6b68db1a9485af7fd4ce76e..4030373fc27fdd767f921e1b2243658918b44497 100644 (file)
--- a/xml/schema/Contact/Contact.xml
+++ b/xml/schema/Contact/Contact.xml
@@ -850,7 +850,6 @@
     <html>
       <type>CheckBox</type>
     </html>
-    <permission>access deleted contacts</permission>
   </field>
   <index>
     <name>index_is_deleted_sort_name</name>