diff --git a/changes/changelog.d/334.enhancement b/changes/changelog.d/334.enhancement new file mode 100644 index 0000000000000000000000000000000000000000..82bee860c83fbe443afa60f928e586eb17b4e584 --- /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 2755dd1903c2f1565bda719d0f2ff6dd809481dd..71355536ede69c74039556b48d75672b072aadf9 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 ba0f484eab885f60ab2620e3118ffc9d8a3b97b1..a5dd08ced47936718c070570772209d4c42d8805 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 781cb86dd4eea3d1a87a6c67349c28469912f288..b24e1109987c7b8b8149b9921f7ed098f0033078 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 b1374633dd4bd37d2dd459d607e2bf8e95d605f5..1c4849cc31f946c1069a8a48907ed297bec3b164 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 49489a31fa8c325417478526020eb2b2304344c4..3c3ac95b33dda065f5ae8c7704f2ece6dd847786 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 e46bf2a318067819d3410c8cd3ac107312aec240..442413c3e04a1e85f0e606459f921b386b25ba08 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 ff26d0f7f5eaae63e9f361efb2e731c6c812d488..9ef6bd9cd3a6338c2324d2944da14272ecf6882a 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 9bec0714200c33c3205af671d48bd851079aebe4..731e19471af4117e1fda989e8ea5f05bb7980f3a 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 da3d6636336c6fe8762c9ddf2b409a9bf4e6ccd9..422c75287d25fec105be6fa08eaac52b9e507ace 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 9ebc077974cf9e3034bc5610b226918137c16ab2..02a889be17679e95e05ed94ec925f9057e24914d 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 886b73fbb98d634ca221cf9ae5f8286f838ac700..0c16a9da785f06a82828f0674ea89faaf3a6ef46 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"