From eb1e358966dd39e4e85a72ebefffb827c01dcbcd Mon Sep 17 00:00:00 2001 From: Deepak Srivastava Date: Wed, 17 Jul 2013 15:59:54 +0530 Subject: [PATCH] CRM-12925 ---------------------------------------- * CRM-12925: Implement "Job" search (for "Search Builder") http://issues.civicrm.org/jira/browse/CRM-12925 --- CRM/Contact/Form/Search/Builder.php | 1 + CRM/Core/BAO/Mapping.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CRM/Contact/Form/Search/Builder.php b/CRM/Contact/Form/Search/Builder.php index 5690430d27..b6e6bdd353 100644 --- a/CRM/Contact/Form/Search/Builder.php +++ b/CRM/Contact/Form/Search/Builder.php @@ -393,6 +393,7 @@ class CRM_Contact_Form_Search_Builder extends CRM_Contact_Form_Search { return array_merge( CRM_Contact_BAO_Contact::exportableFields('All', FALSE, TRUE), CRM_Core_Component::getQueryFields(), + CRM_Contact_BAO_Query_Hook::singleton()->getFields(), CRM_Activity_BAO_Activity::exportableFields() ); } diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php index 47f813fdec..78a276fba1 100644 --- a/CRM/Core/BAO/Mapping.php +++ b/CRM/Core/BAO/Mapping.php @@ -324,6 +324,8 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { $contactType = array('Individual', 'Household', 'Organization'); foreach ($contactType as $value) { $contactFields = CRM_Contact_BAO_Contact::exportableFields($value, FALSE, $required); + $contactFields = array_merge($contactFields, CRM_Contact_BAO_Query_Hook::singleton()->getFields()); + // exclude the address options disabled in the Address Settings $fields[$value] = CRM_Core_BAO_Address::validateAddressOptions($contactFields); -- 2.25.1