diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js index d4fb6db436..7c6d532f5c 100644 --- a/frappe/public/js/frappe/ui/filters/filter.js +++ b/frappe/public/js/frappe/ui/filters/filter.js @@ -249,9 +249,7 @@ frappe.ui.Filter = class { let args = {}; if (this.filters_config[condition].depends_on) { const field_name = this.filters_config[condition].depends_on; - const filter_value = this.base_list - ? this.base_list.get_filter_value(field_name) - : this.filter_list.get_filter_value(field_name); + const filter_value = this.get_filter_value(field_name); args[field_name] = filter_value; } frappe @@ -267,6 +265,10 @@ frappe.ui.Filter = class { } } + get_filter_value(fieldname) { + return this.filter_list.get_filter_value(fieldname); + } + make_field(df, old_fieldtype) { let old_text = this.field ? this.field.get_value() : null; this.hide_invalid_conditions(df.fieldtype, df.original_type); diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js index 7ae48bc7d9..9a35a9bb5f 100644 --- a/frappe/public/js/frappe/ui/filters/filter_list.js +++ b/frappe/public/js/frappe/ui/filters/filter_list.js @@ -104,8 +104,7 @@ frappe.ui.FilterGroup = class { filter_items: (doctype, fieldname) => { return !this.filter_exists([doctype, fieldname]); }, - base_list: this.base_list, - filter_list: this, + filter_list: this.base_list || this, }; let filter = new frappe.ui.Filter(args); this.filters.push(filter);