Merge branch 'develop' of https://github.com/tainacan/tainacan into develop
This commit is contained in:
commit
611b3caa7d
|
@ -275,10 +275,20 @@ class Elastic_Press {
|
||||||
foreach ($formatted_args['sort'] as $sort) {
|
foreach ($formatted_args['sort'] as $sort) {
|
||||||
foreach ($sort as $key => $value) {
|
foreach ($sort as $key => $value) {
|
||||||
$parts = \explode(".", $key);
|
$parts = \explode(".", $key);
|
||||||
if( !in_array("long", $parts) )
|
|
||||||
|
if ($key == 'post_title') {
|
||||||
$new_sort["$key.sortable"] = $value;
|
$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;
|
$new_sort[$key] = $value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$formatted_args['sort'] = $new_sort;
|
$formatted_args['sort'] = $new_sort;
|
||||||
|
|
|
@ -58,8 +58,8 @@
|
||||||
this.type = ( this.filter_type ) ? this.filter_type : this.filter.metadatum.metadata_type;
|
this.type = ( this.filter_type ) ? this.filter_type : this.filter.metadatum.metadata_type;
|
||||||
|
|
||||||
this.loadOptions();
|
this.loadOptions();
|
||||||
|
|
||||||
this.$eventBusSearch.$on('removeFromFilterTag', this.cleanSearchFromTag);
|
this.$eventBusSearch.$on('removeFromFilterTag', this.cleanSearchFromTag);
|
||||||
|
|
||||||
if (this.isUsingElasticSearch)
|
if (this.isUsingElasticSearch)
|
||||||
this.$eventBusSearch.$on('isLoadingItems', this.updatesIsLoading);
|
this.$eventBusSearch.$on('isLoadingItems', this.updatesIsLoading);
|
||||||
|
|
||||||
|
@ -328,7 +328,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
updatesIsLoading(isLoading) {
|
updatesIsLoading(isLoading) {
|
||||||
this.isLoadingOptions = isLoading;
|
this.isLoading = isLoading;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
|
|
Loading…
Reference in New Issue