Skip to content

Commit 279f6d6

Browse files
authored
Merge pull request #266 from devforth/AdminForth/716
Admin forth/716
2 parents c290e0b + e071149 commit 279f6d6

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

adminforth/spa/src/components/ResourceListTable.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<!-- skelet loader -->
77
<div role="status" v-if="!resource || !resource.columns"
88
class="max-w p-4 space-y-4 divide-y divide-gray-200 rounded shadow animate-pulse dark:divide-gray-700 md:p-6 dark:border-gray-700">
9-
109
<div role="status" class="max-w-sm animate-pulse">
1110
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px]"></div>
1211
</div>
@@ -254,8 +253,8 @@
254253

255254
<!-- Help text -->
256255
<span class="text-sm text-gray-700 dark:text-gray-400">
257-
<span v-if="((page || 1) - 1) * pageSize + 1 > totalRows">{{ $t('Wrong Page') }} </span>
258-
<template v-else>
256+
<span v-if="((((page || 1) - 1) * pageSize + 1 > totalRows) && totalRows > 0)">{{ $t('Wrong Page') }} </span>
257+
<template v-else-if="resource && totalRows > 0">
259258

260259
<span class="af-pagination-info hidden sm:inline">
261260
<i18n-t keypath="Showing {from} to {to} of {total} Entries" tag="p" >

adminforth/spa/src/components/ResourceListTableVirtual.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@
271271

272272
<!-- Help text -->
273273
<span class="text-sm text-gray-700 dark:text-gray-400">
274-
<span v-if="((page || 1) - 1) * pageSize + 1 > totalRows">{{ $t('Wrong Page') }} </span>
275-
<template v-else>
274+
<span v-if="((((page || 1) - 1) * pageSize + 1 > totalRows) && totalRows > 0)">{{ $t('Wrong Page') }} </span>
275+
<template v-else-if="resource && totalRows > 0">
276276

277277
<span class="hidden sm:inline">
278278
<i18n-t keypath="Showing {from} to {to} of {total} Entries" tag="p" >

0 commit comments

Comments
 (0)