From aeb0cb4470b97d8fe2b50d2cebcdf1e0d9b142b5 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 30 Jun 2016 13:26:54 +0530 Subject: [PATCH] [fix] consider route options while generating filters --- frappe/public/js/frappe/views/treeview.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js index 79649aa79c..e6f5286015 100644 --- a/frappe/public/js/frappe/views/treeview.js +++ b/frappe/public/js/frappe/views/treeview.js @@ -14,7 +14,6 @@ frappe.views.TreeFactory = frappe.views.Factory.extend({ msgprint(__("Tree view not available for {0}", [route[1]] )); return false; } - $.extend(options, frappe.treeview_settings[route[1]] || {}); new frappe.views.TreeView(options); }); @@ -69,6 +68,10 @@ frappe.views.TreeView = Class.extend({ make_filters: function(){ var me = this; $.each(this.opts.filters || [], function(i, filter){ + if(frappe.route_options && frappe.route_options[filter.fieldname]) { + filter.default = frappe.route_options[filter.fieldname] + } + me.page.add_field(filter).$input .change(function() { me.args[$(this).attr("data-fieldname")] = $(this).val();