From 90bc926730bc96121d6d49460380f2640e47db6e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Nov 2016 10:55:43 +0530 Subject: [PATCH] [minor] added flush feature in error log and apply filters from list only for link and select, fixes frappe/erpnext#6968 (#2350) --- frappe/core/doctype/error_log/error_log.py | 6 ++++++ frappe/core/doctype/error_log/error_log_list.js | 5 +++++ frappe/public/js/frappe/model/create_new.js | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/error_log/error_log.py b/frappe/core/doctype/error_log/error_log.py index 60e8a5f4df..f2ba424d10 100644 --- a/frappe/core/doctype/error_log/error_log.py +++ b/frappe/core/doctype/error_log/error_log.py @@ -19,3 +19,9 @@ def set_old_logs_as_seen(): # clear old logs frappe.db.sql("""delete from `tabError Log` where datediff(curdate(), creation) > 30""") + +@frappe.whitelist() +def clear_error_logs(): + '''Flush all Error Logs''' + frappe.only_for('System Manager') + frappe.db.sql('''delete from `tabError Log`''') \ No newline at end of file diff --git a/frappe/core/doctype/error_log/error_log_list.js b/frappe/core/doctype/error_log/error_log_list.js index a50bfe31f3..7e91292e1f 100644 --- a/frappe/core/doctype/error_log/error_log_list.js +++ b/frappe/core/doctype/error_log/error_log_list.js @@ -8,4 +8,9 @@ frappe.listview_settings['Error Log'] = { } }, order_by: "seen asc, modified desc", + onload: function(listview) { + listview.page.add_menu_item(__("Clear Error Logs"), function() { + frappe.call({method:'frappe.core.doctype.error_log.error_log.clear_error_logs'}); + }); + } }; diff --git a/frappe/public/js/frappe/model/create_new.js b/frappe/public/js/frappe/model/create_new.js index 794a0fbcaa..7c656bac3c 100644 --- a/frappe/public/js/frappe/model/create_new.js +++ b/frappe/public/js/frappe/model/create_new.js @@ -60,7 +60,8 @@ $.extend(frappe.model, { // set route options if(frappe.route_options && !doc.parent) { $.each(frappe.route_options, function(fieldname, value) { - if(frappe.meta.has_field(doctype, fieldname)) { + var df = frappe.meta.has_field(doctype, fieldname); + if(df && in_list(['Link', 'Select'], df.fieldtype)) { doc[fieldname]=value; } });