vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[fix] notification filters, fixes frappe/erpnext#9982 (#3977)

Browse source
This commit is contained in:
Rushabh Mehta 2017-08-23 18:06:03 +05:30 • committed by Nabin Hait
parent cf3a4a61e8
commit 146247c17d
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/core/page/desktop/desktop.js
View file

@ -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);
}
});
},

2
frappe/desk/page/modules/modules.js
View file

@ -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);
}
});

2
frappe/public/js/frappe/form/dashboard.js
View file

@ -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);
}
}

5
frappe/public/js/frappe/ui/toolbar/notifications.js
View file

@ -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) {