Merge branch 'broken-pagination-library' into 'develop'

Fixed broken pagination in uploads table

See merge request funkwhale/funkwhale!1011
This commit is contained in:
Eliot Berriot 2020-01-30 10:44:54 +01:00
commit e0d86b2401
2 changed files with 11 additions and 4 deletions

View File

@ -67,6 +67,16 @@ export default {
orderingDirection: "-", orderingDirection: "-",
ordering: "creation_date", ordering: "creation_date",
}, },
"content.libraries.files": {
paginateBy: 50,
orderingDirection: "-",
ordering: "creation_date",
},
"content.libraries.detail": {
paginateBy: 50,
orderingDirection: "-",
ordering: "creation_date",
},
}, },
serviceWorker: { serviceWorker: {
refreshing: false, refreshing: false,

View File

@ -175,7 +175,7 @@
<div> <div>
<pagination <pagination
v-if="result && result.count > paginateBy" v-if="result && result.count > paginateBy"
@page-changed="selectPage" @page-changed="page = $event; fetchData()"
:compact="true" :compact="true"
:current="page" :current="page"
:paginate-by="paginateBy" :paginate-by="paginateBy"
@ -231,13 +231,10 @@ export default {
isLoading: false, isLoading: false,
result: null, result: null,
page: 1, page: 1,
paginateBy: 25,
search: { search: {
query: this.defaultQuery, query: this.defaultQuery,
tokens: parseTokens(normalizeQuery(this.defaultQuery)) tokens: parseTokens(normalizeQuery(this.defaultQuery))
}, },
orderingDirection: "-",
ordering: "creation_date",
orderingOptions: [ orderingOptions: [
["creation_date", "creation_date"], ["creation_date", "creation_date"],
["title", "track_title"], ["title", "track_title"],