diff --git a/front/core/components/searchbar/searchbar.js b/front/core/components/searchbar/searchbar.js index 10ec1f6085..f2855d711c 100644 --- a/front/core/components/searchbar/searchbar.js +++ b/front/core/components/searchbar/searchbar.js @@ -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)); @@ -102,6 +103,9 @@ export default class Searchbar extends Component { filter = {}; } + let stateParts = this.$state.current.name.split('.'); + this.isIndex = stateParts[1] == 'index'; + this.doSearch(filter, 'state'); } @@ -198,7 +202,7 @@ export default class Searchbar extends Component { } doSearch(filter, source) { - if (filter === this.filter && source != 'state') 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)); diff --git a/modules/zone/front/events/index.html b/modules/zone/front/events/index.html index 9b79f33174..157b2a6690 100644 --- a/modules/zone/front/events/index.html +++ b/modules/zone/front/events/index.html @@ -59,23 +59,23 @@ @@ -97,7 +97,7 @@ vn-bind="+" fixed-bottom-right> - @@ -193,15 +193,15 @@ - - @@ -220,7 +220,7 @@ @@ -248,7 +248,7 @@ ng-model="item.checked" ng-click="$event.preventDefault()" on-change="$ctrl.onItemCheck(item.id, value)" - label="{{::item.name}}"> + label="{{::item.name}}"> diff --git a/modules/zone/front/events/locale/es.yml b/modules/zone/front/events/locale/es.yml index 1fb114720a..d6eee9f67a 100644 --- a/modules/zone/front/events/locale/es.yml +++ b/modules/zone/front/events/locale/es.yml @@ -8,3 +8,5 @@ All: Todo Specific locations: Localizaciones concretas Locations where it is not distributed: Localizaciones en las que no se reparte You must select a location: Debes seleccionar una localización +Add exclusion: Añadir exclusión +Edit exclusion: Editar exclusión