SearchKit - Fix pager count and add 'None Found' text in empty tables

diff --git a/ext/search_kit/ang/crmSearchDisplay/Pager.html b/ext/search_kit/ang/crmSearchDisplay/Pager.html
index d33473c687e7dc5e3dbb56e14e6a93154674bb7a..00bd38b32bed5c1f8d65765e1e67db4ca68c58b8 100644 (file)
--- a/ext/search_kit/ang/crmSearchDisplay/Pager.html
+++ b/ext/search_kit/ang/crmSearchDisplay/Pager.html
@@ -30,7 +30,7 @@
       <label for="crm-search-results-page-size" >
         {{:: ts('Page Size') }}
       </label>
-      <input class="form-control" id="crm-search-results-page-size" type="number" ng-model="$ctrl.limit" min="10" step="10" ng-change="onChangeLimit()">
+      <input class="form-control" id="crm-search-results-page-size" type="number" ng-model="$ctrl.limit" min="10" step="10">
     </div>
   </div>
 </div>

diff --git a/ext/search_kit/ang/crmSearchDisplay/SearchButton.html b/ext/search_kit/ang/crmSearchDisplay/SearchButton.html
index 542d61996d62ee7b0f100f7686f14fc70514eb29..9f20d5e955634a8c09721765f45eb7f09b45500c 100644 (file)
--- a/ext/search_kit/ang/crmSearchDisplay/SearchButton.html
+++ b/ext/search_kit/ang/crmSearchDisplay/SearchButton.html
@@ -1,4 +1,4 @@
-<button type="button" class="btn btn-primary" ng-click="$ctrl.getResults()" ng-disabled="$ctrl.loading">
+<button type="button" class="btn btn-primary" ng-click="$ctrl.onClickSearchButton()" ng-disabled="$ctrl.loading">
   <i ng-if="$ctrl.loading" class="crm-i fa-spin fa-spinner"></i>
   <i ng-if="!$ctrl.loading" class="crm-i fa-search"></i>
   {{:: $ctrl.settings.button }}

diff --git a/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js b/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js
index b2a4e9d7f690215728e98fe754716f320b042dbd..5dd5b827db7dd20f98e2d548411ab7ee5f795081 100644 (file)
--- a/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js
+++ b/ext/search_kit/ang/crmSearchDisplay/traits/searchDisplayBaseTrait.service.js
@@ -131,6 +131,12 @@
         };
       },
 
+      onClickSearchButton: function() {
+        this.rowCount = null;
+        this.page = 1;
+        this.getResults();
+      },
+
       // Call SearchDisplay.run and update ctrl.results and ctrl.rowCount
       runSearch: function(editedRow) {
         var ctrl = this,

diff --git a/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html b/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html
index 3bdf16c9bc5e89c205d0ea1b7c41deeaf73fe1d0..af14b31abe17e68b970c8a233aa27779c8665a27 100644 (file)
--- a/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html
+++ b/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html
@@ -4,5 +4,11 @@
   </td>
   <td ng-repeat="col in $ctrl.settings.columns" ng-include="'~/crmSearchDisplay/colType/' + col.type + '.html'" title="{{:: $ctrl.replaceTokens(col.title, row) }}" class="{{:: col.alignment }}">
   </td>
-  <td></td>
+</tr>
+<tr ng-if="$ctrl.rowCount === 0">
+  <td colspan="{{ $ctrl.settings.columns.length + 2 }}">
+    <p class="alert alert-info text-center">
+      {{:: ts('None Found') }}
+    </p>
+  </td>
 </tr>