CRM-18437 -- No expand icons in manage groups screen

minor fix

diff --git a/CRM/Group/Page/AJAX.php b/CRM/Group/Page/AJAX.php
index 2050348fa90b03bffabe6be09f346a31b3da6cdf..c1e65816356bae682502c45e2e77b4366fe6f361 100644 (file)
--- a/CRM/Group/Page/AJAX.php
+++ b/CRM/Group/Page/AJAX.php
@@ -52,6 +52,12 @@ class CRM_Group_Page_AJAX {
     else {
       $params = CRM_Core_Page_AJAX::defaultSortAndPagerParams();
 
+      $optionalParameters = array(
+        'parentsOnly' => 'Integer',
+        'showOrgInfo' => 'Boolean',
+      );
+      $params += CRM_Core_Page_AJAX::validateParams(array(), $optionalParameters);
+
       // get group list
       $groups = CRM_Contact_BAO_Group::getGroupListSelector($params);
 

diff --git a/templates/CRM/Group/Form/Search.tpl b/templates/CRM/Group/Form/Search.tpl
index 147aefc35c047716638ca840d98c570b8e831978..26107935fc79b4def2752073d4b9b1658ae622a2 100644 (file)
--- a/templates/CRM/Group/Form/Search.tpl
+++ b/templates/CRM/Group/Form/Search.tpl
@@ -211,10 +211,10 @@
               $.each( response.data, function( i, val ) {
                 appendHTML += '<tr id="row_'+val.group_id+'_'+parent_id+'" data-entity="group" data-id="'+val.group_id+'" class="crm-entity parent_is_'+parent_id+' crm-row-child">';
                 if ( val.is_parent ) {
-                  appendHTML += '<td class="crm-group-name crmf-title ' + levelClass + '">' + '{/literal}<span class="collapsed show-children" title="{ts}show child groups{/ts}"/></span><div class="crm-editable">{literal}' + val.title + '</div></td>';
+                  appendHTML += '<td class="crm-group-name crmf-title ' + levelClass + '">' + '{/literal}<span class="collapsed show-children" title="{ts}show child groups{/ts}"/></span><div class="crmf-title crm-editable">{literal}' + val.title + '</div></td>';
                 }
                 else {
-                  appendHTML += '<td class="' + levelClass + '">' + '{/literal}<span class="collapsed show-children" title="{ts}show child groups{/ts}"/></span><span class="crm-group-name crmf-title crm-editable">{literal}' + val.title + '</span></td>';
+                  appendHTML += '<td class="crm-group-name  crmf-title crm-editable ' + levelClass + '"><span class="crm-no-children"></span>' + val.title + '</td>';
                 }
                 appendHTML += '<td class="right">' + val.count + "</td>";
                 appendHTML += "<td>" + val.created_by + "</td>";