diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js index 909f3c70fd..eae5b7a35d 100644 --- a/frappe/core/page/desktop/desktop.js +++ b/frappe/core/page/desktop/desktop.js @@ -124,7 +124,7 @@ $.extend(frappe.desktop, { frappe.desktop.wrapper.on("click", ".circle", function() { var doctype = $(this).attr('data-doctype'); if(doctype) { - frappe.set_route('List', doctype, frappe.ui.notifications.get_filters(doctype)); + frappe.ui.notifications.show_open_count_list(doctype); } }); }, diff --git a/frappe/desk/page/modules/modules.js b/frappe/desk/page/modules/modules.js index 87361d951f..02806396c2 100644 --- a/frappe/desk/page/modules/modules.js +++ b/frappe/desk/page/modules/modules.js @@ -41,7 +41,7 @@ frappe.pages['modules'].on_page_load = function(wrapper) { page.main.on("click", '.open-notification', function(event) { var doctype = $(this).attr('data-doctype'); if(doctype) { - frappe.set_route('List', doctype, frappe.ui.notifications.get_filters(doctype)); + frappe.ui.notifications.show_open_count_list(doctype); } }); diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index ca2b4ab9bd..f4ccd33790 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -233,7 +233,7 @@ frappe.ui.form.Dashboard = Class.extend({ } else { frappe.route_options = this.get_document_filter(doctype); if(show_open) { - $.extend(frappe.route_options, frappe.ui.notifications.get_filters(doctype)); + frappe.ui.notifications.show_open_count_list(doctype); } } diff --git a/frappe/public/js/frappe/ui/toolbar/notifications.js b/frappe/public/js/frappe/ui/toolbar/notifications.js index 0a879f8206..48095c1b8b 100644 --- a/frappe/public/js/frappe/ui/toolbar/notifications.js +++ b/frappe/public/js/frappe/ui/toolbar/notifications.js @@ -103,7 +103,10 @@ frappe.ui.notifications = { show_open_count_list: function(doctype) { let filters = this.boot_info.conditions[doctype]; if(filters && $.isPlainObject(filters)) { - frappe.route_options = filters; + if (!frappe.route_options) { + frappe.route_options = {}; + } + $.extend(frappe.route_options, filters); } let route = frappe.get_route(); if(route[0]==="List" && route[1]===doctype) {