From 24431f7bdaa3be1c06f15dc963e53864d0f4c11a Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 8 Aug 2014 01:23:42 +0100 Subject: [PATCH] Always show parent/child nesting in group selectors --- CRM/Campaign/BAO/Query.php | 4 ++-- CRM/Campaign/Form/Campaign.php | 4 +--- CRM/Campaign/Form/Task/Reserve.php | 4 ++-- CRM/Contact/Form/DedupeFind.php | 4 +--- CRM/Contact/Form/Search/Custom/Basic.php | 8 ++++---- CRM/Contact/Form/Search/Custom/DateAdded.php | 2 +- CRM/Contact/Form/Search/Custom/Group.php | 2 +- .../Form/Search/Custom/MultipleValues.php | 6 +++--- .../Form/Search/Custom/PostalMailing.php | 4 ++-- CRM/Contact/Form/Search/Custom/Proximity.php | 10 +++++----- .../Form/Search/Custom/RandomSegment.php | 2 +- CRM/Contact/Form/Task/AddToGroup.php | 2 +- CRM/Contact/Form/Task/PickProfile.php | 2 +- CRM/Contact/Form/Task/RemoveFromGroup.php | 2 +- CRM/Contact/Import/Form/Preview.php | 4 ++-- CRM/Contribute/Form/Search.php | 2 +- CRM/Core/PseudoConstant.php | 16 ++++++++++++--- .../Form/ManageEvent/ScheduleReminders.php | 3 ++- CRM/Export/Form/Select.php | 3 ++- CRM/Financial/Form/BatchTransaction.php | 2 +- CRM/Mailing/Form/Group.php | 4 ++-- CRM/Report/Form.php | 6 +++--- CRM/SMS/Form/Group.php | 2 +- templates/CRM/Report/Form/Actions.tpl | 20 +++++++++++++++++-- 24 files changed, 71 insertions(+), 47 deletions(-) diff --git a/CRM/Campaign/BAO/Query.php b/CRM/Campaign/BAO/Query.php index 5b4d84124f..44563481ef 100755 --- a/CRM/Campaign/BAO/Query.php +++ b/CRM/Campaign/BAO/Query.php @@ -366,9 +366,9 @@ civicrm_activity_assignment.record_type_id = $assigneeID ) "; $form->add('select', 'contact_type', ts('Contact Type(s)'), $contactTypes, FALSE, array('id' => 'contact_type', 'multiple' => 'multiple', 'class' => 'crm-select2') ); - $groups = CRM_Core_PseudoConstant::group(); + $groups = CRM_Core_PseudoConstant::nestedGroup(); $form->add('select', 'group', ts('Groups'), $groups, FALSE, - array('id' => 'group', 'multiple' => 'multiple', 'class' => 'crm-select2') + array('multiple' => 'multiple', 'class' => 'crm-select2') ); $showInterviewer = FALSE; diff --git a/CRM/Campaign/Form/Campaign.php b/CRM/Campaign/Form/Campaign.php index 2ea0a12bd9..dcfc408878 100644 --- a/CRM/Campaign/Form/Campaign.php +++ b/CRM/Campaign/Form/Campaign.php @@ -255,10 +255,8 @@ class CRM_Campaign_Form_Campaign extends CRM_Core_Form { '' => ts('- select Parent -')) + $campaigns ); } - +$groups = CRM_Core_PseudoConstant::nestedGroup(); //get the campaign groups. - $groups = CRM_Core_PseudoConstant::group(); - $this->add('select', 'includeGroups', ts('Include Group(s)'), $groups, diff --git a/CRM/Campaign/Form/Task/Reserve.php b/CRM/Campaign/Form/Task/Reserve.php index 87e5087058..bdee47493e 100644 --- a/CRM/Campaign/Form/Task/Reserve.php +++ b/CRM/Campaign/Form/Task/Reserve.php @@ -164,12 +164,12 @@ class CRM_Campaign_Form_Task_Reserve extends CRM_Campaign_Form_Task { $this->addElement('text', 'ActivityType', ts('Activity Type')); $this->addElement('text', 'newGroupName', ts('Name for new group')); $this->addElement('text', 'newGroupDesc', ts('Description of new group')); - $groups = CRM_Core_PseudoConstant::group(); + $groups = CRM_Core_PseudoConstant::nestedGroup(); $hasExistingGroups = FALSE; if (is_array($groups) && !empty($groups)) { $hasExistingGroups = TRUE; $this->addElement('select', 'groups', ts('Add respondent(s) to existing group(s)'), - $groups, array('multiple' => "multiple", 'size' => 5) + $groups, array('multiple' => "multiple", 'class' => 'crm-select2') ); } $this->assign('hasExistingGroups', $hasExistingGroups); diff --git a/CRM/Contact/Form/DedupeFind.php b/CRM/Contact/Form/DedupeFind.php index 6fd1a9063f..bd654dd4bb 100644 --- a/CRM/Contact/Form/DedupeFind.php +++ b/CRM/Contact/Form/DedupeFind.php @@ -63,9 +63,7 @@ class CRM_Contact_Form_DedupeFind extends CRM_Admin_Form { */ public function buildQuickForm() { - $groupList = CRM_Core_PseudoConstant::group(); - $groupList[''] = ts('- All Contacts -'); - asort($groupList); + $groupList = array('' => ts('- All Contacts -')) + CRM_Core_PseudoConstant::nestedGroup(); $this->add('select', 'group_id', ts('Select Group'), $groupList, FALSE, array('class' => 'crm-select2 huge')); $this->addButtons(array( diff --git a/CRM/Contact/Form/Search/Custom/Basic.php b/CRM/Contact/Form/Search/Custom/Basic.php index 97ab38508b..2261ce29e6 100644 --- a/CRM/Contact/Form/Search/Custom/Basic.php +++ b/CRM/Contact/Form/Search/Custom/Basic.php @@ -118,15 +118,15 @@ class CRM_Contact_Form_Search_Custom_Basic extends CRM_Contact_Form_Search_Custo // this is loaded onto then replace with something like '__' & test $separator = CRM_Core_DAO::VALUE_SEPARATOR; $contactTypes = array('' => ts('- any contact type -')) + CRM_Contact_BAO_ContactType::getSelectElements(FALSE, TRUE, $separator); - $form->add('select', 'contact_type', ts('Find...'), $contactTypes); + $form->add('select', 'contact_type', ts('Find...'), $contactTypes, FALSE, array('class' => 'crm-select2 huge')); // add select for groups - $group = array('' => ts('- any group -')) + CRM_Core_PseudoConstant::group(); - $form->addElement('select', 'group', ts('in'), $group); + $group = array('' => ts('- any group -')) + CRM_Core_PseudoConstant::nestedGroup(); + $form->addElement('select', 'group', ts('in'), $group, array('class' => 'crm-select2 huge')); // add select for categories $tag = array('' => ts('- any tag -')) + CRM_Core_PseudoConstant::get('CRM_Core_DAO_EntityTag', 'tag_id', array('onlyActive' => FALSE)); - $form->addElement('select', 'tag', ts('Tagged'), $tag); + $form->addElement('select', 'tag', ts('Tagged'), $tag, array('class' => 'crm-select2 huge')); // text for sort_name $form->add('text', 'sort_name', ts('Name')); diff --git a/CRM/Contact/Form/Search/Custom/DateAdded.php b/CRM/Contact/Form/Search/Custom/DateAdded.php index 716b1333fc..f0565c0bfd 100644 --- a/CRM/Contact/Form/Search/Custom/DateAdded.php +++ b/CRM/Contact/Form/Search/Custom/DateAdded.php @@ -60,7 +60,7 @@ class CRM_Contact_Form_Search_Custom_DateAdded extends CRM_Contact_Form_Search_C $form->addDate('start_date', ts('Start Date'), FALSE, array('formatType' => 'custom')); $form->addDate('end_date', ts('End Date'), FALSE, array('formatType' => 'custom')); - $groups = CRM_Core_PseudoConstant::group(); + $groups = CRM_Core_PseudoConstant::nestedGroup(); $select2style = array( 'multiple' => TRUE, diff --git a/CRM/Contact/Form/Search/Custom/Group.php b/CRM/Contact/Form/Search/Custom/Group.php index 51fd1908f4..fa25d7df5d 100644 --- a/CRM/Contact/Form/Search/Custom/Group.php +++ b/CRM/Contact/Form/Search/Custom/Group.php @@ -97,7 +97,7 @@ class CRM_Contact_Form_Search_Custom_Group $this->setTitle(ts('Include / Exclude Search')); - $groups = CRM_Core_PseudoConstant::group(); + $groups = CRM_Core_PseudoConstant::nestedGroup(); $tags = CRM_Core_PseudoConstant::get('CRM_Core_DAO_EntityTag', 'tag_id', array('onlyActive' => FALSE)); if (count($groups) == 0 || count($tags) == 0) { diff --git a/CRM/Contact/Form/Search/Custom/MultipleValues.php b/CRM/Contact/Form/Search/Custom/MultipleValues.php index caf43231ed..df3b9e92b1 100644 --- a/CRM/Contact/Form/Search/Custom/MultipleValues.php +++ b/CRM/Contact/Form/Search/Custom/MultipleValues.php @@ -108,15 +108,15 @@ class CRM_Contact_Form_Search_Custom_MultipleValues extends CRM_Contact_Form_Sea // this is loaded onto then replace with something like '__' & test $separator = CRM_Core_DAO::VALUE_SEPARATOR; $contactTypes = array('' => ts('- any contact type -')) + CRM_Contact_BAO_ContactType::getSelectElements(FALSE, TRUE, $separator); - $form->add('select', 'contact_type', ts('Find...'), $contactTypes); + $form->add('select', 'contact_type', ts('Find...'), $contactTypes, array('class' => 'crm-select2 huge')); // add select for groups $group = array('' => ts('- any group -')) + CRM_Core_PseudoConstant::group(); - $form->addElement('select', 'group', ts('in'), $group); + $form->addElement('select', 'group', ts('in'), $group, array('class' => 'crm-select2 huge')); // add select for tags $tag = array('' => ts('- any tag -')) + CRM_Core_PseudoConstant::get('CRM_Core_DAO_EntityTag', 'tag_id', array('onlyActive' => FALSE)); - $form->addElement('select', 'tag', ts('Tagged'), $tag); + $form->addElement('select', 'tag', ts('Tagged'), $tag, array('class' => 'crm-select2 huge')); if (empty($this->_groupTree)) { CRM_Core_Error::statusBounce(ts("Atleast one Custom Group must be present, for Custom Group search."), diff --git a/CRM/Contact/Form/Search/Custom/PostalMailing.php b/CRM/Contact/Form/Search/Custom/PostalMailing.php index 3bc66a380c..09b36e36a5 100644 --- a/CRM/Contact/Form/Search/Custom/PostalMailing.php +++ b/CRM/Contact/Form/Search/Custom/PostalMailing.php @@ -52,8 +52,8 @@ class CRM_Contact_Form_Search_Custom_PostalMailing extends CRM_Contact_Form_Sear * @param $form */ function buildForm(&$form) { - $groups = array('' => ts('- select group -')) + CRM_Core_PseudoConstant::allGroup(); - $form->addElement('select', 'group_id', ts('Group'), $groups); + $groups = array('' => ts('- select group -')) + CRM_Core_PseudoConstant::nestedGroup(FALSE); + $form->addElement('select', 'group_id', ts('Group'), $groups, array('class' => 'crm-select2 huge')); /** * if you are using the standard template, this array tells the template what elements diff --git a/CRM/Contact/Form/Search/Custom/Proximity.php b/CRM/Contact/Form/Search/Custom/Proximity.php index 6bf658b34e..c9d1dfcd4d 100644 --- a/CRM/Contact/Form/Search/Custom/Proximity.php +++ b/CRM/Contact/Form/Search/Custom/Proximity.php @@ -136,16 +136,16 @@ class CRM_Contact_Form_Search_Custom_Proximity extends CRM_Contact_Form_Search_C else { $stateProvince = array('' => ts('- select -')) + CRM_Core_PseudoConstant::stateProvince(); } - $form->addElement('select', 'state_province_id', ts('State/Province'), $stateProvince); + $form->add('select', 'state_province_id', ts('State/Province'), $stateProvince, FALSE, array('class' => 'crm-select2 huge')); $country = array('' => ts('- select -')) + CRM_Core_PseudoConstant::country(); - $form->add('select', 'country_id', ts('Country'), $country, TRUE); + $form->add('select', 'country_id', ts('Country'), $country, TRUE, array('class' => 'crm-select2 huge')); - $group = array('' => ts('- any group -')) + CRM_Core_PseudoConstant::group(); - $form->addElement('select', 'group', ts('Group'), $group); + $group = array('' => ts('- any group -')) + CRM_Core_PseudoConstant::nestedGroup(); + $form->addElement('select', 'group', ts('Group'), $group, array('class' => 'crm-select2 huge')); $tag = array('' => ts('- any tag -')) + CRM_Core_PseudoConstant::get('CRM_Core_DAO_EntityTag', 'tag_id', array('onlyActive' => FALSE)); - $form->addElement('select', 'tag', ts('Tag'), $tag); + $form->addElement('select', 'tag', ts('Tag'), $tag, array('class' => 'crm-select2 huge')); // state country js, CRM-5233 diff --git a/CRM/Contact/Form/Search/Custom/RandomSegment.php b/CRM/Contact/Form/Search/Custom/RandomSegment.php index 5718a7f3c9..2d5223ec25 100644 --- a/CRM/Contact/Form/Search/Custom/RandomSegment.php +++ b/CRM/Contact/Form/Search/Custom/RandomSegment.php @@ -83,7 +83,7 @@ class CRM_Contact_Form_Search_Custom_RandomSegment extends CRM_Contact_Form_Sear TRUE ); - $groups = CRM_Core_PseudoConstant::group(); + $groups = CRM_Core_PseudoConstant::nestedGroup(); $select2style = array( 'multiple' => TRUE, diff --git a/CRM/Contact/Form/Task/AddToGroup.php b/CRM/Contact/Form/Task/AddToGroup.php index dac5896230..593f28dc0c 100644 --- a/CRM/Contact/Form/Task/AddToGroup.php +++ b/CRM/Contact/Form/Task/AddToGroup.php @@ -125,7 +125,7 @@ class CRM_Contact_Form_Task_AddToGroup extends CRM_Contact_Form_Task { } // add select for groups - $group = array('' => ts('- select group -')) + CRM_Core_PseudoConstant::group(); + $group = array('' => ts('- select group -')) + CRM_Core_PseudoConstant::nestedGroup(); $groupElement = $this->add('select', 'group_id', ts('Select Group'), $group, FALSE, array('class' => 'crm-select2 huge')); diff --git a/CRM/Contact/Form/Task/PickProfile.php b/CRM/Contact/Form/Task/PickProfile.php index 8035110f3e..8714544bfd 100644 --- a/CRM/Contact/Form/Task/PickProfile.php +++ b/CRM/Contact/Form/Task/PickProfile.php @@ -120,7 +120,7 @@ class CRM_Contact_Form_Task_PickProfile extends CRM_Contact_Form_Task { CRM_Core_Session::setStatus(ts("The contact type selected for Batch Update does not have a corresponding profile. Please set up a profile for %1s and try again.", array(1 => $types)), ts('No Profile Available'), 'error'); CRM_Utils_System::redirect($this->_userContext); } - $ufGroupElement = $this->add('select', 'uf_group_id', ts('Select Profile'), array('' => ts('- select profile -')) + $profiles, TRUE); + $ufGroupElement = $this->add('select', 'uf_group_id', ts('Select Profile'), array('' => ts('- select profile -')) + $profiles, TRUE, array('class' => 'crm-select2 huge')); $this->addDefaultButtons(ts('Continue >>')); } diff --git a/CRM/Contact/Form/Task/RemoveFromGroup.php b/CRM/Contact/Form/Task/RemoveFromGroup.php index a75b0918ca..152b5a59a7 100644 --- a/CRM/Contact/Form/Task/RemoveFromGroup.php +++ b/CRM/Contact/Form/Task/RemoveFromGroup.php @@ -49,7 +49,7 @@ class CRM_Contact_Form_Task_RemoveFromGroup extends CRM_Contact_Form_Task { */ function buildQuickForm() { // add select for groups - $group = array('' => ts('- select group -')) + CRM_Core_PseudoConstant::group(); + $group = array('' => ts('- select group -')) + CRM_Core_PseudoConstant::nestedGroup(); $groupElement = $this->add('select', 'group_id', ts('Select Group'), $group, TRUE, array('class' => 'crm-select2 huge')); CRM_Utils_System::setTitle(ts('Remove Contacts from Group')); diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php index 70fdd82071..1dd11b5c98 100644 --- a/CRM/Contact/Import/Form/Preview.php +++ b/CRM/Contact/Import/Form/Preview.php @@ -69,7 +69,7 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview { $this->assign('rowDisplayCount', 2); - $groups = CRM_Core_PseudoConstant::group(); + $groups = CRM_Core_PseudoConstant::nestedGroup(); $this->set('groups', $groups); $tag = CRM_Core_PseudoConstant::get('CRM_Core_DAO_EntityTag', 'tag_id', array('onlyActive' => FALSE)); @@ -139,7 +139,7 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview { $groups = $this->get('groups'); if (!empty($groups)) { - $this->addElement('select', 'groups', ts('Add imported records to existing group(s)'), $groups, array('multiple' => "multiple", 'size' => 5)); + $this->addElement('select', 'groups', ts('Add imported records to existing group(s)'), $groups, array('multiple' => "multiple", 'class' => 'crm-select2')); } //display new tag diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php index 5e18535aee..5a8a86f08f 100644 --- a/CRM/Contribute/Form/Search.php +++ b/CRM/Contribute/Form/Search.php @@ -191,7 +191,7 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { ) ); - $this->_group = CRM_Core_PseudoConstant::group(); + $this->_group = CRM_Core_PseudoConstant::nestedGroup(); // multiselect for groups if ($this->_group) { diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php index a93e07f59e..dfed28d604 100644 --- a/CRM/Core/PseudoConstant.php +++ b/CRM/Core/PseudoConstant.php @@ -980,8 +980,6 @@ WHERE id = %1"; } /** - * DEPRECATED. Please use the buildOptions() method in the appropriate BAO object. - * * Get all permissioned groups from database * * The static array group is returned, and if it's @@ -991,7 +989,7 @@ WHERE id = %1"; * Note: any database errors will be trapped by the DAO. * * @param string $groupType type of group(Access/Mailing) - * @param bool|\boolen $excludeHidden exclude hidden groups. + * @param bool $excludeHidden exclude hidden groups. * * @access public * @static @@ -1002,6 +1000,18 @@ WHERE id = %1"; return CRM_Core_Permission::group($groupType, $excludeHidden); } + /** + * Fetch groups in a nested format suitable for use in select form element + * @param bool $checkPermissions + * @param string|null $groupType + * @param bool $excludeHidden + * @return array + */ + public static function nestedGroup($checkPermissions = TRUE, $groupType = NULL, $excludeHidden = TRUE) { + $groups = $checkPermissions ? self::group($groupType, $excludeHidden) : self::allGroup($groupType, $excludeHidden); + return CRM_Contact_BAO_Group::getGroupsHierarchy($groups, NULL, '  ', TRUE); + } + /** * Get all permissioned groups from database * diff --git a/CRM/Event/Form/ManageEvent/ScheduleReminders.php b/CRM/Event/Form/ManageEvent/ScheduleReminders.php index 690bee73e5..f0c4688834 100755 --- a/CRM/Event/Form/ManageEvent/ScheduleReminders.php +++ b/CRM/Event/Form/ManageEvent/ScheduleReminders.php @@ -199,8 +199,9 @@ class CRM_Event_Form_ManageEvent_ScheduleReminders extends CRM_Event_Form_Manage $this->addEntityRef('recipient_manual_id', ts('Manual Recipients'), array('multiple' => true)); + $groups = CRM_Contact_BAO_Group::getGroupsHierarchy(CRM_Core_PseudoConstant::staticGroup(), NULL, '  ', TRUE); $this->add('select', 'group_id', ts('Group'), - CRM_Core_PseudoConstant::staticGroup(), FALSE, array('class' => 'crm-select2 huge') + $groups, FALSE, array('class' => 'crm-select2 huge') ); CRM_Mailing_BAO_Mailing::commonCompose($this); diff --git a/CRM/Export/Form/Select.php b/CRM/Export/Form/Select.php index 03dcb99128..e5a88fe3ba 100644 --- a/CRM/Export/Form/Select.php +++ b/CRM/Export/Form/Select.php @@ -302,7 +302,8 @@ FROM {$this->_componentTable} $this->addGroup($postalMailing, 'postal_mailing_export', ts('Postal Mailing Export'), '
'); $this->addElement('select', 'additional_group', ts('Additional Group for Export'), - array('' => ts('- select group -')) + CRM_Core_PseudoConstant::group() + array('' => ts('- select group -')) + CRM_Core_PseudoConstant::nestedGroup(), + array('class' => 'crm-select2 huge') ); } diff --git a/CRM/Financial/Form/BatchTransaction.php b/CRM/Financial/Form/BatchTransaction.php index acebc2ae35..71cd443bcc 100644 --- a/CRM/Financial/Form/BatchTransaction.php +++ b/CRM/Financial/Form/BatchTransaction.php @@ -101,7 +101,7 @@ class CRM_Financial_Form_BatchTransaction extends CRM_Contribute_Form { ) ); - $this->_group = CRM_Core_PseudoConstant::group(); + $this->_group = CRM_Core_PseudoConstant::nestedGroup(); // multiselect for groups if ($this->_group) { diff --git a/CRM/Mailing/Form/Group.php b/CRM/Mailing/Form/Group.php index e0621be85d..4fd9df5910 100644 --- a/CRM/Mailing/Form/Group.php +++ b/CRM/Mailing/Form/Group.php @@ -214,7 +214,7 @@ class CRM_Mailing_Form_Group extends CRM_Contact_Form_Task { $this->addElement('checkbox', 'dedupe_email', ts('Remove duplicate emails?')); //get the mailing groups. - $groups = CRM_Core_PseudoConstant::group('Mailing'); + $groups = CRM_Core_PseudoConstant::nestedGroup('Mailing'); if ($hiddenMailingGroup) { $groups[$hiddenMailingGroup] = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Group', $hiddenMailingGroup, 'title'); @@ -235,7 +235,7 @@ class CRM_Mailing_Form_Group extends CRM_Contact_Form_Task { $this->add('select', 'baseGroup', ts('Unsubscription Group'), array( - '' => ts('- select -')) + $staticGroups, + '' => ts('- select -')) + CRM_Contact_BAO_Group::getGroupsHierarchy($staticGroups, NULL, '  ', TRUE), TRUE, array('class' => 'crm-select2 huge') ); diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php index 85ae9302c7..2e70b5ac93 100644 --- a/CRM/Report/Form.php +++ b/CRM/Report/Form.php @@ -1108,13 +1108,13 @@ class CRM_Report_Form extends CRM_Core_Form { if (CRM_Core_Permission::check('administer Reports') && $this->_add2groupSupported) { $this->addElement('select', 'groups', ts('Group'), - array('' => ts('- select group -')) + CRM_Core_PseudoConstant::staticGroup() + array('' => ts('Add Contacts to Group')) + CRM_Core_PseudoConstant::nestedGroup(), + array('class' => 'crm-select2 crm-action-menu action-icon-plus huge') ); $this->assign('group', TRUE); } - $label = ts('Add These Contacts to Group'); - $this->addElement('submit', $this->_groupButtonName, $label, array('onclick' => 'return checkGroup();')); + $this->addElement('submit', $this->_groupButtonName, '', array('style' => 'display: none;')); $this->addChartOptions(); $this->addButtons(array( diff --git a/CRM/SMS/Form/Group.php b/CRM/SMS/Form/Group.php index 6270e4fe31..ca4ac6d06c 100644 --- a/CRM/SMS/Form/Group.php +++ b/CRM/SMS/Form/Group.php @@ -121,7 +121,7 @@ class CRM_SMS_Form_Group extends CRM_Contact_Form_Task { ); //get the mailing groups. - $groups = CRM_Core_PseudoConstant::group('Mailing'); + $groups = CRM_Core_PseudoConstant::nestedGroup('Mailing'); //get the sms mailing list $mailings = CRM_Mailing_PseudoConstant::completed('sms'); diff --git a/templates/CRM/Report/Form/Actions.tpl b/templates/CRM/Report/Form/Actions.tpl index 70c4fb4960..0cba19d649 100644 --- a/templates/CRM/Report/Form/Actions.tpl +++ b/templates/CRM/Report/Form/Actions.tpl @@ -57,8 +57,24 @@ {/if} {if $form.groups} - {$form.groups.html|crmAddClass:big} - {$form.$group.html} + + {$form.groups.html}{$form.$group.html} + + {/if} -- 2.25.1