From d69d223927d6a65760859c85752c322847510d44 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 1 Dec 2021 20:34:49 -0500 Subject: [PATCH] Revert "Add permission metadata to contact is_deleted field" 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 | 5 +---- xml/schema/Contact/Contact.xml | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CRM/Contact/DAO/Contact.php b/CRM/Contact/DAO/Contact.php index 860e6e9c50..a6bb970eea 100644 --- 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 59ee1a7cbd..4030373fc2 100644 --- a/xml/schema/Contact/Contact.xml +++ b/xml/schema/Contact/Contact.xml @@ -850,7 +850,6 @@ CheckBox - access deleted contacts index_is_deleted_sort_name -- 2.25.1