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

Merge branch 'develop' of https://github.com/tainacan/tainacan into develop

This commit is contained in:
leogermani 2019-05-16 11:59:41 -03:00
parent 05453f22af 89b2e599f8
commit 611b3caa7d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/classes/class-tainacan-elastic-press.php
View File

@ -275,12 +275,22 @@ class Elastic_Press {
foreach ($formatted_args['sort'] as $sort) {
foreach ($sort as $key => $value) {
$parts = \explode(".", $key);
if( !in_array("long", $parts) )
if ($key == 'post_title') {
$new_sort["$key.sortable"] = $value;
else
} elseif ($key == 'post_author') {
$new_sort["post_author.login.sortable"] = $value;
} elseif ($key == 'post_name') {
$new_sort["post_name.raw"] = $value;
} elseif ($key == 'post_type') {
$new_sort["post_type.raw"] = $value;
} elseif( !in_array("long", $parts) && in_array("meta", $parts) ) {
$new_sort["$key.sortable"] = $value;
} else {
$new_sort[$key] = $value;
}
}
}
$formatted_args['sort'] = $new_sort;
}
return $formatted_args;

4
src/classes/filter-types/taxonomy/Checkbox.vue
View File

@ -58,8 +58,8 @@
this.type = ( this.filter_type ) ? this.filter_type : this.filter.metadatum.metadata_type;
this.loadOptions();
this.$eventBusSearch.$on('removeFromFilterTag', this.cleanSearchFromTag);
if (this.isUsingElasticSearch)
this.$eventBusSearch.$on('isLoadingItems', this.updatesIsLoading);
@ -328,7 +328,7 @@
}
},
updatesIsLoading(isLoading) {
this.isLoadingOptions = isLoading;
this.isLoading = isLoading;
}
},
beforeDestroy() {