diff --git a/src/layouts/cards/cards.vue b/src/layouts/cards/cards.vue index c88e32abca..2c21e09e4c 100644 --- a/src/layouts/cards/cards.vue +++ b/src/layouts/cards/cards.vue @@ -52,7 +52,7 @@ - {{ showingCount }} + {{ showingCount }} @@ -230,7 +230,7 @@ export default defineComponent({ const { size, icon, imageSource, title, subtitle, imageFit } = useViewOptions(); const { sort, limit, page, fields } = useViewQuery(); - const { items, loading, error, totalPages, itemCount, totalCount } = useItems(collection, { + const { items, loading, error, totalPages, itemCount } = useItems(collection, { sort, limit, page, @@ -251,8 +251,8 @@ export default defineComponent({ const showingCount = computed(() => { return i18n.t('start_end_of_count_items', { start: i18n.n((+page.value - 1) * limit.value + 1), - end: i18n.n(Math.min(page.value * limit.value, totalCount.value || 0)), - count: i18n.n(totalCount.value || 0), + end: i18n.n(Math.min(page.value * limit.value, itemCount.value || 0)), + count: i18n.n(itemCount.value || 0), }); }); @@ -282,7 +282,6 @@ export default defineComponent({ newLink, info, clearFilters, - totalCount, showingCount, }; diff --git a/src/layouts/tabular/tabular.vue b/src/layouts/tabular/tabular.vue index ed1d81f5e6..37867dcb39 100644 --- a/src/layouts/tabular/tabular.vue +++ b/src/layouts/tabular/tabular.vue @@ -53,7 +53,7 @@ - + {{ showingCount }} @@ -226,22 +226,17 @@ export default defineComponent({ const { sort, limit, page, fields } = useItemOptions(); - const { - items, - loading, - error, - totalPages, - itemCount, - totalCount, - changeManualSort, - } = useItems(collection, { - sort, - limit, - page, - fields, - filters: _filters, - searchQuery, - }); + const { items, loading, error, totalPages, itemCount, changeManualSort } = useItems( + collection, + { + sort, + limit, + page, + fields, + filters: _filters, + searchQuery, + } + ); const { tableSort, @@ -265,8 +260,8 @@ export default defineComponent({ const showingCount = computed(() => { return i18n.t('start_end_of_count_items', { start: i18n.n((+page.value - 1) * limit.value + 1), - end: i18n.n(Math.min(page.value * limit.value, totalCount.value || 0)), - count: i18n.n(totalCount.value || 0), + end: i18n.n(Math.min(page.value * limit.value, itemCount.value || 0)), + count: i18n.n(itemCount.value || 0), }); }); @@ -295,7 +290,6 @@ export default defineComponent({ info, newLink, clearFilters, - totalCount, showingCount, sortField, changeManualSort,