Begins implementaion of warning for less items than total due to sorting by custom metadata. Checks for undefined cases on orderByName decision.
This commit is contained in:
parent
c2db4b9a82
commit
d2bbbb5008
|
@ -11,8 +11,9 @@
|
||||||
getFirstItem() +
|
getFirstItem() +
|
||||||
$i18n.get('info_to') +
|
$i18n.get('info_to') +
|
||||||
getLastItemNumber() +
|
getLastItemNumber() +
|
||||||
$i18n.get('info_of') + totalItems + '.'
|
$i18n.get('info_of')
|
||||||
}}
|
}}
|
||||||
|
<span :class="{ 'has-text-warning': collectionTotalItems > totalItems }">{{ totalItems + '.' }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="items-per-page">
|
<div class="items-per-page">
|
||||||
<b-field
|
<b-field
|
||||||
|
@ -94,6 +95,10 @@ export default {
|
||||||
},
|
},
|
||||||
totalPages(){
|
totalPages(){
|
||||||
return Math.ceil(Number(this.totalItems)/Number(this.itemsPerPage));
|
return Math.ceil(Number(this.totalItems)/Number(this.itemsPerPage));
|
||||||
|
},
|
||||||
|
collectionTotalItems() {
|
||||||
|
// console.log(this.getCollectionTotalItems().total_items// .status....)
|
||||||
|
return this.getCollectionTotalItems().total_items;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
@ -103,6 +108,9 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
...mapGetters('collection', [
|
||||||
|
'getCollectionTotalItems'
|
||||||
|
]),
|
||||||
...mapGetters('search', [
|
...mapGetters('search', [
|
||||||
'getTotalItems',
|
'getTotalItems',
|
||||||
'getPage',
|
'getPage',
|
||||||
|
|
|
@ -897,9 +897,9 @@
|
||||||
for (let metadatum of this.sortingMetadata) {
|
for (let metadatum of this.sortingMetadata) {
|
||||||
|
|
||||||
if (
|
if (
|
||||||
((this.orderBy != 'meta_value' && this.orderBy != 'meta_value_num' && metadatum.slug == 'creation_date' && !metadatum.metadata_type_object.core) && this.orderBy == 'date') ||
|
((this.orderBy != 'meta_value' && this.orderBy != 'meta_value_num' && metadatum.slug == 'creation_date' && (!metadatum.metadata_type_object || !metadatum.metadata_type_object.core)) && this.orderBy == 'date') ||
|
||||||
((this.orderBy != 'meta_value' && this.orderBy != 'meta_value_num' && metadatum.slug != 'creation_date' && metadatum.metadata_type_object.core) && this.orderBy == metadatum.metadata_type_object.related_mapped_prop) ||
|
((this.orderBy != 'meta_value' && this.orderBy != 'meta_value_num' && metadatum.slug != 'creation_date' && (metadatum.metadata_type_object != undefined && metadatum.metadata_type_object.core)) && this.orderBy == metadatum.metadata_type_object.related_mapped_prop) ||
|
||||||
((this.orderBy != 'meta_value' && this.orderBy != 'meta_value_num' && metadatum.slug != 'creation_date' && !metadatum.metadata_type_object.core) && this.orderBy == metadatum.slug) ||
|
((this.orderBy != 'meta_value' && this.orderBy != 'meta_value_num' && metadatum.slug != 'creation_date' && (!metadatum.metadata_type_object || !metadatum.metadata_type_object.core)) && this.orderBy == metadatum.slug) ||
|
||||||
((this.orderBy == 'meta_value' || this.orderBy == 'meta_value_num') && this.getMetaKey() == metadatum.id)
|
((this.orderBy == 'meta_value' || this.orderBy == 'meta_value_num') && this.getMetaKey() == metadatum.id)
|
||||||
)
|
)
|
||||||
return metadatum.name;
|
return metadatum.name;
|
||||||
|
|
|
@ -862,9 +862,9 @@
|
||||||
for (let metadatum of this.sortingMetadata) {
|
for (let metadatum of this.sortingMetadata) {
|
||||||
|
|
||||||
if (
|
if (
|
||||||
((this.orderBy != 'meta_value' && this.orderBy != 'meta_value_num' && metadatum.slug == 'creation_date' && !metadatum.metadata_type_object.core) && this.orderBy == 'date') ||
|
((this.orderBy != 'meta_value' && this.orderBy != 'meta_value_num' && metadatum.slug == 'creation_date' && (!metadatum.metadata_type_object || !metadatum.metadata_type_object.core)) && this.orderBy == 'date') ||
|
||||||
((this.orderBy != 'meta_value' && this.orderBy != 'meta_value_num' && metadatum.slug != 'creation_date' && metadatum.metadata_type_object.core) && this.orderBy == metadatum.metadata_type_object.related_mapped_prop) ||
|
((this.orderBy != 'meta_value' && this.orderBy != 'meta_value_num' && metadatum.slug != 'creation_date' && (metadatum.metadata_type_object != undefined && metadatum.metadata_type_object.core)) && this.orderBy == metadatum.metadata_type_object.related_mapped_prop) ||
|
||||||
((this.orderBy != 'meta_value' && this.orderBy != 'meta_value_num' && metadatum.slug != 'creation_date' && !metadatum.metadata_type_object.core) && this.orderBy == metadatum.slug) ||
|
((this.orderBy != 'meta_value' && this.orderBy != 'meta_value_num' && metadatum.slug != 'creation_date' && (!metadatum.metadata_type_object || !metadatum.metadata_type_object.core)) && this.orderBy == metadatum.slug) ||
|
||||||
((this.orderBy == 'meta_value' || this.orderBy == 'meta_value_num') && this.getMetaKey() == metadatum.id)
|
((this.orderBy == 'meta_value' || this.orderBy == 'meta_value_num') && this.getMetaKey() == metadatum.id)
|
||||||
)
|
)
|
||||||
return metadatum.name;
|
return metadatum.name;
|
||||||
|
|
Loading…
Reference in New Issue