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

Merge pull request #1891 from SevanNerse/master

Browse Source 
values of selected filters are arranged #1869
This commit is contained in:
Cüneyt Şentürk 2021-02-26 17:27:11 +03:00 committed by GitHub
commit d6cd3696c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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);
@ -635,10 +636,12 @@ export default {
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);
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]);
} }
} }