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

fix: don't set undefined filters

Browse source
This commit is contained in:
prssanna 2020-08-26 23:10:42 +05:30
parent 68d9c92c70
commit 6ad81dc690
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/public/js/frappe/ui/filters/filter_list.js
View file

@ -64,7 +64,6 @@ frappe.ui.FilterGroup = class {
if (!this.wrapper) {
this.wrapper = $('.filter-popover');
console.log('shownn', this.filters);
if (hide_empty_filters) {
this.toggle_empty_filters(false);
this.add_filters_to_popover(this.filters);
@ -76,8 +75,8 @@ frappe.ui.FilterGroup = class {
});
this.filter_button.on('hidden.bs.popover', (e) => {
this.on_change();
this.update_filters();
this.on_change();
});
$(window).on('hashchange', () => {
@ -243,7 +242,9 @@ frappe.ui.FilterGroup = class {
}
update_filters() {
this.filters = this.filters.filter((f) => f.field); // remove hidden filters
// remove hidden filters and undefined filters
this.filters.map(f => !f.get_selected_value() && f.remove());
this.filters = this.filters.filter(f => f.get_selected_value() && f.field);
this.update_filter_button();
this.filters.length === 0 &&
this.toggle_empty_filters(true);