tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Forces setting isLoadingOptions to false when using elastic search.

This commit is contained in:
mateuswetah 2020-06-29 10:04:18 -03:00
parent dee546186a
commit a1f52ea9bf
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/admin/components/filter-types/taxonomy/Checkbox.vue
View File

@ -184,6 +184,9 @@
this.prepareOptionsForTaxonomy(this.facetsFromItemSearch[facet]); this.prepareOptionsForTaxonomy(this.facetsFromItemSearch[facet]);
else else
this.prepareOptionsForTaxonomy(Object.values(this.facetsFromItemSearch[facet])); this.prepareOptionsForTaxonomy(Object.values(this.facetsFromItemSearch[facet]));
if (this.isUsingElasticSearch)
this.isLoadingOptions = false;
} }
} }
} }

6
src/views/admin/js/filter-types-mixin.js
View File

@ -133,6 +133,9 @@ export const dynamicFilterTypeMixin = {
for (const facet in this.facetsFromItemSearch) { for (const facet in this.facetsFromItemSearch) {
if (facet == this.filter.id) { if (facet == this.filter.id) {
this.prepareOptionsForPlainText(this.facetsFromItemSearch[facet], search, valuesToIgnore, isInCheckboxModal); this.prepareOptionsForPlainText(this.facetsFromItemSearch[facet], search, valuesToIgnore, isInCheckboxModal);
if (this.isUsingElasticSearch)
this.isLoadingOptions = false;
} }
} }
resolve(); resolve();
@ -210,6 +213,9 @@ export const dynamicFilterTypeMixin = {
for (const facet in this.facetsFromItemSearch) { for (const facet in this.facetsFromItemSearch) {
if (facet == this.filter.id) { if (facet == this.filter.id) {
this.prepareOptionsForRelationship(this.facetsFromItemSearch[facet], search, valuesToIgnore, isInCheckboxModal); this.prepareOptionsForRelationship(this.facetsFromItemSearch[facet], search, valuesToIgnore, isInCheckboxModal);
if (this.isUsingElasticSearch)
this.isLoadingOptions = false;
} }
} }
resolve(); resolve();