commit e75984c483501f5c6325a1da91750c0f45d6c6fe
author Kalyani <kalyani.kashikar@freestoneinfotech.com> Tue May 23 18:38:55 2017 +0530
committer nixonrodrigues <nixon@apache.org> Fri May 26 15:48:48 2017 +0530
tree 3f71a92f32ec8e6a5ad859c460607e4a0fd9abe4
parent 64988b8a36258541b2131ad32cbdadc80e4faadd

ATLAS-1817 : UI : n+1 pages are created, even though only n*25 instances are retrieved

Signed-off-by: nixonrodrigues <nixon@apache.org>

dashboardv2/public/js/views/search/SearchResultLayoutView.js

diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index 25df9b5..1c9320c 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -255,7 +255,12 @@
                         if (!(that.ui.pageRecordText instanceof jQuery)) {
                             return;
                         }
-
+                        if (that.searchCollection.models.length === 0) {
+                            that.ui.nextData.attr('disabled', true);
+                            that.offset = that.offset - that.limit;
+                            that.hideLoader();
+                            return;
+                        }
                         if (that.searchCollection.models.length < that.limit) {
                             that.ui.nextData.attr('disabled', true);
                         } else {
@@ -272,7 +277,7 @@
                             that.pageTo = that.pageTo - that.limit;
                             that.pageFrom = (that.pageTo - that.limit) + 1;
                         }
-                        that.ui.pageRecordText.html("Showing  <u>" + that.searchCollection.models.length + " records</u>, from " + that.pageFrom + " - " + that.pageTo);
+                        that.ui.pageRecordText.html("Showing  <u>" + that.searchCollection.models.length + " records</u> From " + that.pageFrom + " - " + that.pageTo);
                         if (that.offset < that.limit && that.pageFrom < 26) {
                             that.ui.previousData.attr('disabled', true);
                         }