shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

values of selected filters are arranged #1869

Browse Source
This commit is contained in:
Sevan Nerse 2021-02-26 17:23:12 +03:00
parent 739c2ebebf
commit 18c4b345e5
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/assets/js/components/AkauntingSearch.vue
View File

@ -598,6 +598,7 @@ export default {
let option = ''; let option = '';
let operator = '='; let operator = '=';
let value = ''; let value = '';
let value_assigned = false;
this.filter_list.forEach(function (_filter, i) { this.filter_list.forEach(function (_filter, i) {
let filter_values = this.convertOption(_filter.values); let filter_values = this.convertOption(_filter.values);
@ -630,20 +631,20 @@ export default {
this.option_values[_filter.key] = filter_values; this.option_values[_filter.key] = filter_values;
if (filter_values.length > 0) {
filter_values.forEach(function (value, j) { filter_values.forEach(function (value, j) {
if (value.key == filter[1]) { if (value.key == filter[1]) {
this.selected_values.push(value); this.selected_values.push(value);
this.option_values[_filter.key].splice(j, 1); this.option_values[_filter.key].splice(j, 1);
value_assigned = true
} }
}, this); }, this);
} else {
if (cookie != undefined && cookie[_filter.key]) { if (!value_assigned && (cookie != undefined && cookie[_filter.key])) {
this.selected_values.push(cookie[_filter.key]); this.selected_values.push(cookie[_filter.key]);
} }
} }
}
}, this); }, this);
this.filtered.push({ this.filtered.push({