mirror
/
mobilizon
mirror of https://framagit.org/framasoft/mobilizon.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'main' into 'main' 

fix: bind pagination current prop

Closes #1088 et #1152

See merge request framasoft/mobilizon!1382
This commit is contained in:
Thomas Citharel 2023-05-02 13:33:08 +00:00
parent 94a51fbcab 4bcf572c54
commit 7b796a1d3a
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/components/Resource/ResourceSelector.vue
View File

@ -50,7 +50,7 @@
<o-pagination <o-pagination
v-if="resource.children && resource.children.total > RESOURCES_PER_PAGE" v-if="resource.children && resource.children.total > RESOURCES_PER_PAGE"
:total="resource.children.total" :total="resource.children.total"
v-model="page" v-model:current="page"
size="small" size="small"
:per-page="RESOURCES_PER_PAGE" :per-page="RESOURCES_PER_PAGE"
:aria-next-label="t('Next page')" :aria-next-label="t('Next page')"

2
js/src/views/Discussions/DiscussionsListView.vue
View File

@ -45,7 +45,7 @@
v-show="group.discussions.total > DISCUSSIONS_PER_PAGE" v-show="group.discussions.total > DISCUSSIONS_PER_PAGE"
class="discussion-pagination" class="discussion-pagination"
:total="group.discussions.total" :total="group.discussions.total"
v-model="page" v-model:current="page"
:per-page="DISCUSSIONS_PER_PAGE" :per-page="DISCUSSIONS_PER_PAGE"
:aria-next-label="t('Next page')" :aria-next-label="t('Next page')"
:aria-previous-label="t('Previous page')" :aria-previous-label="t('Previous page')"

2
js/src/views/Group/MyGroups.vue
View File

@ -33,7 +33,7 @@
<o-pagination <o-pagination
:total="membershipsPages.total" :total="membershipsPages.total"
v-show="membershipsPages.total > limit" v-show="membershipsPages.total > limit"
v-model="page" v-model:current="page"
:per-page="limit" :per-page="limit"
:aria-next-label="t('Next page')" :aria-next-label="t('Next page')"
:aria-previous-label="t('Previous page')" :aria-previous-label="t('Previous page')"

2
js/src/views/Moderation/LogsView.vue
View File

@ -417,7 +417,7 @@
</ul> </ul>
<o-pagination <o-pagination
:total="actionLogs.total" :total="actionLogs.total"
v-model="page" v-model:current="page"
:per-page="LOGS_PER_PAGE" :per-page="LOGS_PER_PAGE"
:aria-next-label="$t('Next page')" :aria-next-label="$t('Next page')"
:aria-previous-label="$t('Previous page')" :aria-previous-label="$t('Previous page')"

2
js/src/views/Moderation/ReportListView.vue
View File

@ -72,7 +72,7 @@
</div> </div>
<o-pagination <o-pagination
:total="reports.total" :total="reports.total"
v-model="page" v-model:current="page"
:simple="true" :simple="true"
:per-page="REPORT_PAGE_LIMIT" :per-page="REPORT_PAGE_LIMIT"
:aria-next-label="t('Next page')" :aria-next-label="t('Next page')"

2
js/src/views/Posts/ListView.vue
View File

@ -57,7 +57,7 @@
</o-notification> </o-notification>
<o-pagination <o-pagination
:total="group.posts.total" :total="group.posts.total"
v-model="postsPage" v-model:current="postsPage"
:per-page="POSTS_PAGE_LIMIT" :per-page="POSTS_PAGE_LIMIT"
:aria-next-label="$t('Next page')" :aria-next-label="$t('Next page')"
:aria-previous-label="$t('Previous page')" :aria-previous-label="$t('Previous page')"

2
js/src/views/Resources/ResourceFolder.vue
View File

@ -46,7 +46,7 @@
<o-pagination <o-pagination
v-if="resource.children.total > RESOURCES_PER_PAGE" v-if="resource.children.total > RESOURCES_PER_PAGE"
:total="resource.children.total" :total="resource.children.total"
v-model="page" v-model:current="page"
:per-page="RESOURCES_PER_PAGE" :per-page="RESOURCES_PER_PAGE"
:aria-next-label="t('Next page')" :aria-next-label="t('Next page')"
:aria-previous-label="t('Previous page')" :aria-previous-label="t('Previous page')"