From a571cb9f91094fa5971f282c88c735dda859e131 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 14 Jun 2021 11:02:17 +0530 Subject: [PATCH 1/3] fix: Allow to remove filters from shortcut completely --- frappe/public/js/frappe/widgets/widget_dialog.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index eefb78c29a..3f5a4acd73 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -271,18 +271,19 @@ class ShortcutDialog extends WidgetDialog { } process_data(data) { - let stats_filter = {}; if (this.dialog.get_value("type") == "DocType" && this.filter_group) { let filters = this.filter_group.get_filters(); + let stats_filter = null; if (filters.length) { + stats_filter = {}; filters.forEach((arr) => { stats_filter[arr[1]] = [arr[2], arr[3]]; }); - - data.stats_filter = JSON.stringify(stats_filter); + stats_filter = JSON.stringify(stats_filter); } + data.stats_filter = stats_filter; } data.label = data.label From 425b73ab6a33260fe9807e68f023f68f785ba698 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 14 Jun 2021 11:03:13 +0530 Subject: [PATCH 2/3] fix: Remove "No filter" message while adding filters --- frappe/public/js/frappe/ui/filters/filter_list.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js index 611ab024bf..69a9457c35 100644 --- a/frappe/public/js/frappe/ui/filters/filter_list.js +++ b/frappe/public/js/frappe/ui/filters/filter_list.js @@ -323,6 +323,7 @@ frappe.ui.FilterGroup = class { } add_filters_to_filter_group(filters) { + this.toggle_empty_filters(false); filters.forEach((filter) => { this.add_filter(filter[0], filter[1], filter[2], filter[3]); }); From e7d1eecef98db1481e7cd7cdba1b3badb4cfdad7 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 14 Jun 2021 11:53:20 +0530 Subject: [PATCH 3/3] fix: Remove "No filter" message only if filter exists --- frappe/public/js/frappe/ui/filters/filter_list.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js index 69a9457c35..72312d7f13 100644 --- a/frappe/public/js/frappe/ui/filters/filter_list.js +++ b/frappe/public/js/frappe/ui/filters/filter_list.js @@ -323,10 +323,12 @@ frappe.ui.FilterGroup = class { } add_filters_to_filter_group(filters) { - this.toggle_empty_filters(false); - filters.forEach((filter) => { - this.add_filter(filter[0], filter[1], filter[2], filter[3]); - }); + if (filters.length) { + this.toggle_empty_filters(false); + filters.forEach((filter) => { + this.add_filter(filter[0], filter[1], filter[2], filter[3]); + }); + } } add(filters, refresh = true) {