This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 5bd179ca074a7eef0b66b7e5640acab9efceb278
Author: kevalbhatt <kbh...@apache.org>
AuthorDate: Wed Jun 10 16:20:03 2020 +0530
ATLAS-3769:- UI: Changing page limit in Admin audits resets any filters
applied on that page
(cherry picked from commit 8092d6b5fda19ba523742444123bdbbe9b428914)
---
dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js | 6 +++---
dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
index 00e0953..bc0990f 100644
--- a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
@@ -56,7 +56,7 @@ define(['require',
events["click " + this.ui.adminEntityClick] =
"onClickAdminEntity";
events["change " + this.ui.adminType] = "onClickAdminType";
events["click " + this.ui.attrFilter] = function(e) {
- this.$('.fa-angle-right').toggleClass('fa-angle-down');
+
this.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down');
this.$('.attributeResultContainer').addClass("overlay");
this.$('.attribute-filter-container,
.attr-filter-overlay').toggleClass('hide');
this.onClickAttrFilter();
@@ -120,7 +120,7 @@ define(['require',
closeAttributeModel: function() {
var that = this;
that.$('.attributeResultContainer').removeClass("overlay");
- that.$('.fa-angle-right').toggleClass('fa-angle-down');
+
that.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down');
that.$('.attribute-filter-container,
.attr-filter-overlay').toggleClass('hide');
},
getAttributes: function(options) {
@@ -133,7 +133,6 @@ define(['require',
"attributeValue": (adminFilter.type == "date" &&
options.isDateParsed) ? Date.parse(adminFilter.value).toString() :
adminFilter.value
})
})
- this.isFilters = null;
} else {
adminAttributes = [{
"attributeName": "userName",
@@ -301,6 +300,7 @@ define(['require',
},
onClickAdminType: function(e, value) {
this.onlyPurged = e.currentTarget.value === "Purged";
+ this.isFilters = null;
this.defaultPagination();
this.getAdminCollection();
},
diff --git a/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
b/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
index 00e0953..bc0990f 100644
--- a/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
@@ -56,7 +56,7 @@ define(['require',
events["click " + this.ui.adminEntityClick] =
"onClickAdminEntity";
events["change " + this.ui.adminType] = "onClickAdminType";
events["click " + this.ui.attrFilter] = function(e) {
- this.$('.fa-angle-right').toggleClass('fa-angle-down');
+
this.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down');
this.$('.attributeResultContainer').addClass("overlay");
this.$('.attribute-filter-container,
.attr-filter-overlay').toggleClass('hide');
this.onClickAttrFilter();
@@ -120,7 +120,7 @@ define(['require',
closeAttributeModel: function() {
var that = this;
that.$('.attributeResultContainer').removeClass("overlay");
- that.$('.fa-angle-right').toggleClass('fa-angle-down');
+
that.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down');
that.$('.attribute-filter-container,
.attr-filter-overlay').toggleClass('hide');
},
getAttributes: function(options) {
@@ -133,7 +133,6 @@ define(['require',
"attributeValue": (adminFilter.type == "date" &&
options.isDateParsed) ? Date.parse(adminFilter.value).toString() :
adminFilter.value
})
})
- this.isFilters = null;
} else {
adminAttributes = [{
"attributeName": "userName",
@@ -301,6 +300,7 @@ define(['require',
},
onClickAdminType: function(e, value) {
this.onlyPurged = e.currentTarget.value === "Purged";
+ this.isFilters = null;
this.defaultPagination();
this.getAdminCollection();
},
