From 40d91fb8702ddf88d04bb749e7aaf4c654c5a983 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Thu, 29 Jun 2017 16:58:37 +0530 Subject: [PATCH] [minor] fixes in clear-filters --- frappe/public/js/frappe/ui/base_list.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/ui/base_list.js b/frappe/public/js/frappe/ui/base_list.js index 1902d288a8..8f04efe6ba 100644 --- a/frappe/public/js/frappe/ui/base_list.js +++ b/frappe/public/js/frappe/ui/base_list.js @@ -195,7 +195,7 @@ frappe.ui.BaseList = Class.extend({ var has_standard_filters = false; this.meta.fields.forEach(function(df) { if(df.in_standard_filter) { - if(df.fieldtype == "Select") { + if(df.fieldtype == "Select" && df.options) { var options = df.options.split("\n") if(options.length > 0 && options[0] != ""){ options.unshift(""); @@ -249,7 +249,7 @@ frappe.ui.BaseList = Class.extend({ set_filters_from_route_options: function ({clear_filters=true} = {}) { var me = this; - if(clear_filters) { + if(this.filter_list && clear_filters) { this.filter_list.clear_filters(); } @@ -272,7 +272,7 @@ frappe.ui.BaseList = Class.extend({ doctype = frappe.meta.get_doctype_for_field(me.doctype, field); } - if (doctype) { + if (doctype && me.filter_list) { if ($.isArray(value)) { me.filter_list.add_filter(doctype, field, value[0], value[1]); } else {