From baaa0a255b1efefb4fbf9fb48ace918cdb1898f5 Mon Sep 17 00:00:00 2001
From: Monish Deb <deb.monish@gmail.com>
Date: Fri, 9 Oct 2020 09:53:04 +0530
Subject: [PATCH] core#2105: Groups children now get shown with SPAN CSS error
---
CRM/Contact/Form/Edit/TagsAndGroups.php | 2 +-
CRM/Contact/Form/Search/Basic.php | 2 +-
CRM/Contact/Form/Search/Criteria.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CRM/Contact/Form/Edit/TagsAndGroups.php b/CRM/Contact/Form/Edit/TagsAndGroups.php
index 9299246d9b..de2084c0a2 100644
--- a/CRM/Contact/Form/Edit/TagsAndGroups.php
+++ b/CRM/Contact/Form/Edit/TagsAndGroups.php
@@ -88,7 +88,7 @@ class CRM_Contact_Form_Edit_TagsAndGroups {
}
if ($groupID || !empty($group)) {
- $groups = CRM_Contact_BAO_Group::getGroupsHierarchy($ids);
+ $groups = CRM_Contact_BAO_Group::getGroupsHierarchy($ids, NULL, '- ');
$attributes['skiplabel'] = TRUE;
$elements = [];
diff --git a/CRM/Contact/Form/Search/Basic.php b/CRM/Contact/Form/Search/Basic.php
index 6deec9e2a4..537e19e0bd 100644
--- a/CRM/Contact/Form/Search/Basic.php
+++ b/CRM/Contact/Form/Search/Basic.php
@@ -49,7 +49,7 @@ class CRM_Contact_Form_Search_Basic extends CRM_Contact_Form_Search {
// add select for groups
// Get hierarchical listing of groups, respecting ACLs for CRM-16836.
- $groupHierarchy = CRM_Contact_BAO_Group::getGroupsHierarchy($this->_group, NULL, ' ');
+ $groupHierarchy = CRM_Contact_BAO_Group::getGroupsHierarchy($this->_group, NULL, '- ');
if (!empty($searchOptions['groups'])) {
$this->addField('group', [
'entity' => 'group_contact',
diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php
index bd2d5829da..6bcad01d86 100644
--- a/CRM/Contact/Form/Search/Criteria.php
+++ b/CRM/Contact/Form/Search/Criteria.php
@@ -42,7 +42,7 @@ class CRM_Contact_Form_Search_Criteria {
// multiselect for groups
if ($form->_group) {
// Arrange groups into hierarchical listing (child groups follow their parents and have indentation spacing in title)
- $groupHierarchy = CRM_Contact_BAO_Group::getGroupsHierarchy($form->_group, NULL, ' ', TRUE);
+ $groupHierarchy = CRM_Contact_BAO_Group::getGroupsHierarchy($form->_group, NULL, '- ', TRUE);
$form->add('select', 'group', ts('Groups'), $groupHierarchy, FALSE,
['id' => 'group', 'multiple' => 'multiple', 'class' => 'crm-select2']
--
2.25.1