Skip to content
Snippets Groups Projects
Commit 7a22cb61 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch '334-empty-pagination' into 'develop'

Resolve "Don't display an empty page browser"

Closes #334

See merge request funkwhale/funkwhale!316
parents 203b691a a4047ff4
No related branches found
No related tags found
No related merge requests found
Pipeline #1541 passed with warnings with stages
in 6 minutes and 17 seconds
Showing
with 12 additions and 11 deletions
Ensure we do not display pagination on single pages (#334)
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<track-table v-if="results" :tracks="results.results"></track-table> <track-table v-if="results" :tracks="results.results"></track-table>
<div class="ui center aligned basic segment"> <div class="ui center aligned basic segment">
<pagination <pagination
v-if="results && results.count > 0" v-if="results && results.count > paginateBy"
@page-changed="selectPage" @page-changed="selectPage"
:current="page" :current="page"
:paginate-by="paginateBy" :paginate-by="paginateBy"
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<tr> <tr>
<th> <th>
<pagination <pagination
v-if="result && result.results.length > 0" v-if="result && result.count > paginateBy"
@page-changed="selectPage" @page-changed="selectPage"
:compact="true" :compact="true"
:current="page" :current="page"
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</div> </div>
<div> <div>
<pagination <pagination
v-if="result && result.results.length > 0" v-if="result && result.count > paginateBy"
@page-changed="selectPage" @page-changed="selectPage"
:compact="true" :compact="true"
:current="page" :current="page"
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</div> </div>
<div class="ui center aligned basic segment"> <div class="ui center aligned basic segment">
<pagination <pagination
v-if="result && result.results.length > 0" v-if="result && result.count > paginateBy"
@page-changed="selectPage" @page-changed="selectPage"
:current="page" :current="page"
:paginate-by="paginateBy" :paginate-by="paginateBy"
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</div> </div>
<div class="ui center aligned basic segment"> <div class="ui center aligned basic segment">
<pagination <pagination
v-if="result && result.results.length > 0" v-if="result && result.count > paginateBy"
@page-changed="selectPage" @page-changed="selectPage"
:current="page" :current="page"
:paginate-by="paginateBy" :paginate-by="paginateBy"
......
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<tr> <tr>
<th> <th>
<pagination <pagination
v-if="jobResult && jobResult.results.length > 0" v-if="jobResult && jobResult.count > jobFilters.paginateBy"
@page-changed="selectPage" @page-changed="selectPage"
:compact="true" :compact="true"
:current="jobFilters.page" :current="jobFilters.page"
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<tr> <tr>
<th> <th>
<pagination <pagination
v-if="result && result.results.length > 0" v-if="result && result.count > filters.paginateBy"
@page-changed="selectPage" @page-changed="selectPage"
:compact="true" :compact="true"
:current="filters.page" :current="filters.page"
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</div> </div>
<div> <div>
<pagination <pagination
v-if="result && result.results.length > 0" v-if="result && result.count > paginateBy"
@page-changed="selectPage" @page-changed="selectPage"
:compact="true" :compact="true"
:current="page" :current="page"
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
</div> </div>
<div> <div>
<pagination <pagination
v-if="result && result.results.length > 0" v-if="result && result.count > paginateBy"
@page-changed="selectPage" @page-changed="selectPage"
:compact="true" :compact="true"
:current="page" :current="page"
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</div> </div>
<div> <div>
<pagination <pagination
v-if="result && result.results.length > 0" v-if="result && result.count > paginateBy"
@page-changed="selectPage" @page-changed="selectPage"
:compact="true" :compact="true"
:current="page" :current="page"
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</div> </div>
<div> <div>
<pagination <pagination
v-if="result && result.results.length > 0" v-if="result && result.count > paginateBy"
@page-changed="selectPage" @page-changed="selectPage"
:compact="true" :compact="true"
:current="page" :current="page"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment