From 61c895c2fc9488abdbccbe1f17ac73705ade24b2 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Thu, 16 Jun 2022 15:17:48 +0530 Subject: [PATCH] refactor: update listview URL on all refresh Previous changes only made it refresh on change of filters, this change now updates URL ALWAYS. Co-Auhtored-By: Suraj Shetty --- frappe/public/js/frappe/list/list_view.js | 3 ++- frappe/public/js/frappe/views/kanban/kanban_view.js | 1 - frappe/public/js/frappe/views/reports/query_report.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index da6d2a78f6..3a39a949c9 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -291,6 +291,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { super.refresh().then(() => { this.render_header(refresh_header); this.update_checkbox(); + this.update_url_with_filters(); }); } @@ -1454,7 +1455,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { on_update() {} - on_filter_change() { + update_url_with_filters() { window.history.replaceState(null, null, this.get_url_with_filters()); } diff --git a/frappe/public/js/frappe/views/kanban/kanban_view.js b/frappe/public/js/frappe/views/kanban/kanban_view.js index 02acfef278..129db13b07 100644 --- a/frappe/public/js/frappe/views/kanban/kanban_view.js +++ b/frappe/public/js/frappe/views/kanban/kanban_view.js @@ -101,7 +101,6 @@ frappe.views.KanbanView = class KanbanView extends frappe.views.ListView { } else { this.page.clear_indicator(); } - super.on_filter_change(); } save_kanban_board_filters() { diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 8f1cecb965..ac7f8327ab 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -57,7 +57,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { this.menu_items = []; } - on_filter_change() { + update_url_with_filters() { window.history.replaceState(null, null, this.get_url_with_filters()); } @@ -506,7 +506,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { if (df.on_change) f.on_change = df.on_change; df.onchange = () => { - this.on_filter_change(); this.refresh_filters_dependency(); let current_filters = this.get_filter_values(); @@ -681,6 +680,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { frappe.hide_progress(); }).finally(() => { this.hide_loading_screen(); + this.update_url_with_filters(); }); }