jon/com.dpci.constituentsonly
1
0
Fork 0
forked from CiviWare/com.dpci.constituentsonly
Code Issues Pull Requests Releases Wiki Activity

Fixed display when non-default view is selected

Browse Source
This commit is contained in:
CiviWare Solutions 2018-12-12 14:38:16 +00:00
parent 2419a5752e
commit 425d0431c5
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CRM/ConstituentsOnly/BAO/ConstituentsOnly.php
View File

@ -171,14 +171,19 @@ class CRM_ConstituentsOnly_BAO_ConstituentsOnly {
} }
} }
if (in_array($url, ['civicrm/contact/search/builder']) || !empty($request['uf_group_id'])) { if (in_array($url, ['civicrm/contact/search/builder']) || !empty($request['uf_group_id'])) {
foreach ($headers as $header) { $returnProperties = CRM_Core_Session::singleton()->get('return_properties_search');
if (!empty($header['sort'])) { if (!empty($returnProperties)) {
$returnProperties[$header['sort']] = 1; foreach ($headers as $header) {
if (!empty($header['sort'])) {
$headerName = str_replace('`', '', $header['sort']);
$returnProperties[$headerName] = 1;
}
} }
$returnProperties['contact_sub_type'] = 1;
$returnProperties['contact_type'] = 1;
} }
$returnProperties['contact_sub_type'] = 1;
$returnProperties['contact_type'] = 1;
} }
$queryParams = CRM_Contact_BAO_Query::convertFormValues($formValues); $queryParams = CRM_Contact_BAO_Query::convertFormValues($formValues);
$selector = new CRM_Contact_Selector( $selector = new CRM_Contact_Selector(
'', '',

1
CRM/ConstituentsOnly/BAO/Query.php
View File

@ -13,6 +13,7 @@ class CRM_ConstituentsOnly_BAO_Query extends CRM_Contact_BAO_Query_Interface {
* *
*/ */
public function select(&$query) { public function select(&$query) {
CRM_Core_Session::singleton()->set('return_properties_search', $query->_returnProperties);
// hack for profile search // hack for profile search
$url = CRM_Utils_Array::value('q', $_GET); $url = CRM_Utils_Array::value('q', $_GET);
if (in_array($url, ['civicrm/profile', 'civicrm/contact/search/builder'])) { if (in_array($url, ['civicrm/profile', 'civicrm/contact/search/builder'])) {