From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 10 Jul 2020 13:36:06 +0000 (-0400)
Subject: Search extension - improve results display
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2d198bb4d5065581108240bfd7e26b8ddf6807eb;p=civicrm-core.git

Search extension - improve results display
---

diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
index 8e71a60761..300093736b 100644
--- a/ext/search/ang/search/crmSearch.component.js
+++ b/ext/search/ang/search/crmSearch.component.js
@@ -318,6 +318,9 @@
         if (info.fn && info.fn.name === 'GROUP_CONCAT' && value) {
           return formatGroupConcatValues(info, value);
         }
+        else if (info.fn && info.fn.name === 'COUNT') {
+          return value;
+        }
         return formatFieldValue(info.field, value);
       };
 
@@ -329,6 +332,9 @@
         else if (type === 'Boolean' && typeof value === 'boolean') {
           return value ? ts('Yes') : ts('No');
         }
+        else if (type === 'Money') {
+          return CRM.formatMoney(value);
+        }
         return value;
       }
 
diff --git a/ext/search/ang/search/crmSearch/results.html b/ext/search/ang/search/crmSearch/results.html
index ab14f816d2..01b200207c 100644
--- a/ext/search/ang/search/crmSearch/results.html
+++ b/ext/search/ang/search/crmSearch/results.html
@@ -16,7 +16,7 @@
   </thead>
   <tbody>
     <tr ng-repeat="row in $ctrl.results[$ctrl.page]">
-      <td class="crm-search-result-select">
+      <td>
         <input type="checkbox" ng-checked="isRowSelected(row)" ng-click="selectRow(row)" ng-disabled="!(loading === false && !loadingAllRows && row.id)">
       </td>
       <td ng-repeat="col in $ctrl.params.select">
diff --git a/ext/search/css/search.css b/ext/search/css/search.css
index cf549baf4e..70b329b563 100644
--- a/ext/search/css/search.css
+++ b/ext/search/css/search.css
@@ -147,3 +147,7 @@
 #bootstrap-theme.crm-search .btn.form-control {
   height: 36px;
 }
+
+#bootstrap-theme.crm-search th.crm-search-result-select {
+  padding-right: 10px;
+}