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

Resolve "Don't display an empty page browser"

Closes #334

See merge request funkwhale/funkwhale!316
This commit is contained in:
Eliot Berriot 2018-07-11 17:15:03 +00:00
commit 7a22cb61eb
12 changed files with 12 additions and 11 deletions

View File

@ -0,0 +1 @@
Ensure we do not display pagination on single pages (#334)

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"