From a4047ff472aceef1f221c3a0520589afde1128ef Mon Sep 17 00:00:00 2001
From: Renon <renon@disroot.org>
Date: Wed, 11 Jul 2018 17:15:03 +0000
Subject: [PATCH] Resolve "Don't display an empty page browser"
---
changes/changelog.d/334.enhancement | 1 +
front/src/components/favorites/List.vue | 2 +-
front/src/components/federation/LibraryFollowTable.vue | 2 +-
front/src/components/federation/LibraryTrackTable.vue | 2 +-
front/src/components/library/Artists.vue | 2 +-
front/src/components/library/Radios.vue | 2 +-
front/src/components/library/import/BatchDetail.vue | 2 +-
front/src/components/library/import/BatchList.vue | 2 +-
front/src/components/manage/library/FilesTable.vue | 2 +-
front/src/components/manage/library/RequestsTable.vue | 2 +-
front/src/components/manage/users/InvitationsTable.vue | 2 +-
front/src/components/manage/users/UsersTable.vue | 2 +-
12 files changed, 12 insertions(+), 11 deletions(-)
create mode 100644 changes/changelog.d/334.enhancement
diff --git a/changes/changelog.d/334.enhancement b/changes/changelog.d/334.enhancement
new file mode 100644
index 00000000..82bee860
--- /dev/null
+++ b/changes/changelog.d/334.enhancement
@@ -0,0 +1 @@
+Ensure we do not display pagination on single pages (#334)
diff --git a/front/src/components/favorites/List.vue b/front/src/components/favorites/List.vue
index 2755dd19..71355536 100644
--- a/front/src/components/favorites/List.vue
+++ b/front/src/components/favorites/List.vue
@@ -49,7 +49,7 @@
<track-table v-if="results" :tracks="results.results"></track-table>
<div class="ui center aligned basic segment">
<pagination
- v-if="results && results.count > 0"
+ v-if="results && results.count > paginateBy"
@page-changed="selectPage"
:current="page"
:paginate-by="paginateBy"
diff --git a/front/src/components/federation/LibraryFollowTable.vue b/front/src/components/federation/LibraryFollowTable.vue
index ba0f484e..a5dd08ce 100644
--- a/front/src/components/federation/LibraryFollowTable.vue
+++ b/front/src/components/federation/LibraryFollowTable.vue
@@ -86,7 +86,7 @@
<tr>
<th>
<pagination
- v-if="result && result.results.length > 0"
+ v-if="result && result.count > paginateBy"
@page-changed="selectPage"
:compact="true"
:current="page"
diff --git a/front/src/components/federation/LibraryTrackTable.vue b/front/src/components/federation/LibraryTrackTable.vue
index 781cb86d..b24e1109 100644
--- a/front/src/components/federation/LibraryTrackTable.vue
+++ b/front/src/components/federation/LibraryTrackTable.vue
@@ -87,7 +87,7 @@
</div>
<div>
<pagination
- v-if="result && result.results.length > 0"
+ v-if="result && result.count > paginateBy"
@page-changed="selectPage"
:compact="true"
:current="page"
diff --git a/front/src/components/library/Artists.vue b/front/src/components/library/Artists.vue
index b1374633..1c4849cc 100644
--- a/front/src/components/library/Artists.vue
+++ b/front/src/components/library/Artists.vue
@@ -57,7 +57,7 @@
</div>
<div class="ui center aligned basic segment">
<pagination
- v-if="result && result.results.length > 0"
+ v-if="result && result.count > paginateBy"
@page-changed="selectPage"
:current="page"
:paginate-by="paginateBy"
diff --git a/front/src/components/library/Radios.vue b/front/src/components/library/Radios.vue
index 49489a31..3c3ac95b 100644
--- a/front/src/components/library/Radios.vue
+++ b/front/src/components/library/Radios.vue
@@ -63,7 +63,7 @@
</div>
<div class="ui center aligned basic segment">
<pagination
- v-if="result && result.results.length > 0"
+ v-if="result && result.count > paginateBy"
@page-changed="selectPage"
:current="page"
:paginate-by="paginateBy"
diff --git a/front/src/components/library/import/BatchDetail.vue b/front/src/components/library/import/BatchDetail.vue
index e46bf2a3..442413c3 100644
--- a/front/src/components/library/import/BatchDetail.vue
+++ b/front/src/components/library/import/BatchDetail.vue
@@ -117,7 +117,7 @@
<tr>
<th>
<pagination
- v-if="jobResult && jobResult.results.length > 0"
+ v-if="jobResult && jobResult.count > jobFilters.paginateBy"
@page-changed="selectPage"
:compact="true"
:current="jobFilters.page"
diff --git a/front/src/components/library/import/BatchList.vue b/front/src/components/library/import/BatchList.vue
index ff26d0f7..9ef6bd9c 100644
--- a/front/src/components/library/import/BatchList.vue
+++ b/front/src/components/library/import/BatchList.vue
@@ -62,7 +62,7 @@
<tr>
<th>
<pagination
- v-if="result && result.results.length > 0"
+ v-if="result && result.count > filters.paginateBy"
@page-changed="selectPage"
:compact="true"
:current="filters.page"
diff --git a/front/src/components/manage/library/FilesTable.vue b/front/src/components/manage/library/FilesTable.vue
index 9bec0714..731e1947 100644
--- a/front/src/components/manage/library/FilesTable.vue
+++ b/front/src/components/manage/library/FilesTable.vue
@@ -86,7 +86,7 @@
</div>
<div>
<pagination
- v-if="result && result.results.length > 0"
+ v-if="result && result.count > paginateBy"
@page-changed="selectPage"
:compact="true"
:current="page"
diff --git a/front/src/components/manage/library/RequestsTable.vue b/front/src/components/manage/library/RequestsTable.vue
index da3d6636..422c7528 100644
--- a/front/src/components/manage/library/RequestsTable.vue
+++ b/front/src/components/manage/library/RequestsTable.vue
@@ -93,7 +93,7 @@
</div>
<div>
<pagination
- v-if="result && result.results.length > 0"
+ v-if="result && result.count > paginateBy"
@page-changed="selectPage"
:compact="true"
:current="page"
diff --git a/front/src/components/manage/users/InvitationsTable.vue b/front/src/components/manage/users/InvitationsTable.vue
index 9ebc0779..02a889be 100644
--- a/front/src/components/manage/users/InvitationsTable.vue
+++ b/front/src/components/manage/users/InvitationsTable.vue
@@ -65,7 +65,7 @@
</div>
<div>
<pagination
- v-if="result && result.results.length > 0"
+ v-if="result && result.count > paginateBy"
@page-changed="selectPage"
:compact="true"
:current="page"
diff --git a/front/src/components/manage/users/UsersTable.vue b/front/src/components/manage/users/UsersTable.vue
index 886b73fb..0c16a9da 100644
--- a/front/src/components/manage/users/UsersTable.vue
+++ b/front/src/components/manage/users/UsersTable.vue
@@ -76,7 +76,7 @@
</div>
<div>
<pagination
- v-if="result && result.results.length > 0"
+ v-if="result && result.count > paginateBy"
@page-changed="selectPage"
:compact="true"
:current="page"
--
GitLab