diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
index a47c78601..d737a32c9 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
@@ -108,7 +108,7 @@ describe('ContributionMessagesList', () => {
id: 42,
memo: 'test memo',
userId: 108,
- status: 'PENDING',
+ contributionStatus: 'PENDING',
user: defaultUser,
},
hideResubmission: true,
@@ -153,7 +153,7 @@ describe('ContributionMessagesList', () => {
it('does not render the ContributionMessagesFormular when status is not PENDING or IN_PROGRESS', async () => {
await wrapper.setProps({
contribution: {
- status: 'COMPLETED',
+ contributionStatus: 'COMPLETED',
user: defaultUser,
},
})
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 09b5a69ac..2175c73ed 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -41,7 +41,7 @@
/>
-
+
{
let store
const mockItems = [
- { id: 1, status: 'PENDING', userId: 2, moderatorId: null, messagesCount: 0 },
- { id: 2, status: 'CONFIRMED', userId: 3, moderatorId: 1, messagesCount: 2 },
+ { id: 1, contributionStatus: 'PENDING', userId: 2, moderatorId: null, messagesCount: 0 },
+ { id: 2, contributionStatus: 'CONFIRMED', userId: 3, moderatorId: 1, messagesCount: 2 },
]
const mockFields = [
- { key: 'status', label: 'Status' },
+ { key: 'contributionStatus', label: 'Status' },
{ key: 'bookmark', label: 'Bookmark' },
{ key: 'memo', label: 'Memo' },
{ key: 'editCreation', label: 'Edit' },
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 5bce1bfb7..d94f85bae 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -9,12 +9,12 @@
stacked="md"
:tbody-tr-class="rowClass"
>
-
-
-
-
-
-
+
+
+
+
+
+
@@ -51,11 +51,11 @@
{
})
it('formats status correctly for different scenarios', () => {
- const statusField = wrapper.vm.fields.find((f) => f.key === 'status')
+ const statusField = wrapper.vm.fields.find((f) => f.key === 'contributionStatus')
// Open transaction
expect(statusField.formatter(null, null, mockLinks[0])).toBe('open')
diff --git a/admin/src/components/TransactionLinkList.vue b/admin/src/components/TransactionLinkList.vue
index e967fdc81..19c23880b 100644
--- a/admin/src/components/TransactionLinkList.vue
+++ b/admin/src/components/TransactionLinkList.vue
@@ -54,7 +54,7 @@ const fields = computed(() => [
formatter: (value) => d(new Date(value)),
},
{
- key: 'status',
+ key: 'contributionStatus',
label: 'status',
formatter: (value, key, item) => {
if (item.deletedAt) return `${t('deleted')}: ${d(new Date(item.deletedAt))}`
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 78bfc7e90..9d2b572a7 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -129,7 +129,7 @@ const fields = computed(() => [
// { key: 'confirm_mail', label: t('confirmed') },
// { key: 'has_elopage', label: 'elopage' },
// { key: 'transactions_list', label: t('transaction') },
- { key: 'status', label: t('status') },
+ { key: 'contributionStatus', label: t('status') },
])
watch(