verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

fix: merge filter
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Vicent Llopis 2022-11-22 10:36:40 +01:00
parent 37b312564e
commit 89141419c1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
front/core/components/searchbar/searchbar.js
View File

@ -26,6 +26,7 @@ export default class Searchbar extends Component {
this.autoState = true;
this.separateIndex = true;
this.entityState = 'card.summary';
this.isIndex = false;
this.deregisterCallback = this.$transitions.onSuccess(
{}, transition => this.onStateChange(transition));
@ -103,9 +104,9 @@ export default class Searchbar extends Component {
}
let stateParts = this.$state.current.name.split('.');
const isIndex = stateParts[1] == 'index';
this.isIndex = stateParts[1] == 'index';
this.doSearch(filter, isIndex ? 'index' : 'state');
this.doSearch(filter, 'state');
}
openPanel(event) {
@ -201,7 +202,7 @@ export default class Searchbar extends Component {
}
doSearch(filter, source) {
if (filter === this.filter && source != 'index') return;
if (filter === this.filter && !this.isIndex) return;
let promise = this.onSearch({$params: filter});
promise = promise || this.$q.resolve();
promise.then(data => this.onFilter(filter, source, data));