From 317450e4b241dee31b282eed796629b1cb028110 Mon Sep 17 00:00:00 2001 From: joanagmaia Date: Tue, 26 Sep 2023 10:06:20 +0100 Subject: [PATCH] Fix organization csv export (#1549) --- .../components/list/organization-list-table.vue | 1 + .../components/list/organization-list-toolbar.vue | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/frontend/src/modules/organization/components/list/organization-list-table.vue b/frontend/src/modules/organization/components/list/organization-list-table.vue index 36423f185f..925e99cf8f 100644 --- a/frontend/src/modules/organization/components/list/organization-list-table.vue +++ b/frontend/src/modules/organization/components/list/organization-list-table.vue @@ -65,6 +65,7 @@ diff --git a/frontend/src/modules/organization/components/list/organization-list-toolbar.vue b/frontend/src/modules/organization/components/list/organization-list-toolbar.vue index 56f2ca5aa6..1bc05458a3 100644 --- a/frontend/src/modules/organization/components/list/organization-list-toolbar.vue +++ b/frontend/src/modules/organization/components/list/organization-list-toolbar.vue @@ -95,6 +95,16 @@ import { DEFAULT_ORGANIZATION_FILTERS } from '@/modules/organization/store/const import { OrganizationPermissions } from '../../organization-permissions'; import { OrganizationService } from '../../organization-service'; +const props = defineProps({ + pagination: { + type: Object, + default: () => ({ + page: 1, + perPage: 20, + }), + }, +}); + const { currentUser, currentTenant } = mapGetters('auth'); const organizationStore = useOrganizationStore(); @@ -185,8 +195,8 @@ const handleDoExport = async () => { const response = await OrganizationService.query({ filter, orderBy: `${filters.value.order.prop}_${filters.value.order.order === 'descending' ? 'DESC' : 'ASC'}`, - limit: null, - offset: null, + offset: (props.pagination.page - 1) * props.pagination.perPage || 0, + limit: props.pagination.perPage || 20, }); Excel.exportAsExcelFile(