This is an automated email from the ASF dual-hosted git repository. nixon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git
commit eced9a6945934a9930de137976b744ca2aeacec3 Author: gutkaBinit <[email protected]> AuthorDate: Thu May 30 12:27:06 2019 +0530 ATLAS-3248 UI: Number of Search Page results not matching set Page limit. Signed-off-by: nixonrodrigues <[email protected]> --- dashboardv2/public/js/utils/TableLayout.js | 1 + dashboardv2/public/js/views/search/SearchResultLayoutView.js | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dashboardv2/public/js/utils/TableLayout.js b/dashboardv2/public/js/utils/TableLayout.js index abb32fa..d8b52af 100644 --- a/dashboardv2/public/js/utils/TableLayout.js +++ b/dashboardv2/public/js/utils/TableLayout.js @@ -273,6 +273,7 @@ define(['require', }, this); this.listenTo(this, "grid:refresh", function() { if (this.grid) { + this.grid.collection.fullCollection.reset(this.collection.entities, { silent: true }); this.grid.trigger("backgrid:refresh"); } }); diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js b/dashboardv2/public/js/views/search/SearchResultLayoutView.js index eab8b50..50dbbb7 100644 --- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js +++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js @@ -267,7 +267,7 @@ define(['require', el: this.ui.colManager }, gridOpts: { - emptyText: 'No Record found!', + emptyText: 'No Records found!', className: 'table table-hover backgrid table-quickMenu colSort' }, filterOpts: {}, @@ -425,12 +425,13 @@ define(['require', return; } if (isPostMethod) { - that.searchCollection.referredEntities = dataOrCollection.referredEntities; Utils.findAndMergeRefEntity({ attributeObject: dataOrCollection.entities, referredEntities: dataOrCollection.referredEntities }); - that.searchCollection.fullCollection.reset(dataOrCollection.entities, { silent: false }); + that.searchCollection.referredEntities = dataOrCollection.referredEntities; + that.searchCollection.entities = dataOrCollection.entities; + that.searchCollection.reset(dataOrCollection.entities, { silent: true }); }
