Search extension - improve results display

diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
index 8e71a60761dd958e29f5f1f6a1a6ae2a936454be..300093736b3afc08fe2208e420dce44f4fbd6a75 100644 (file)
--- 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 ab14f816d2fc3234b101f6227e2a7b967c79bb89..01b200207ccbcbad97ec25bbd6e4291d8dc56005 100644 (file)
--- 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 cf549baf4e751289e16929ad59f4fd91939b21c5..70b329b563245bf14ed60b635575bd15f3f88ba3 100644 (file)
--- 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;
+}