diff --git a/admin/.env.dist b/admin/.env.dist index c3d62bfd2..62c2b0ffd 100644 --- a/admin/.env.dist +++ b/admin/.env.dist @@ -3,4 +3,5 @@ GRAPHQL_PATH=/graphql WALLET_URL=http://localhost WALLET_AUTH_PATH=/authenticate?token= WALLET_LOGIN_PATH=/login -DEBUG_DISABLE_AUTH=false \ No newline at end of file +DEBUG_DISABLE_AUTH=false +HUMHUB_ACTIVE=false \ No newline at end of file diff --git a/admin/.env.template b/admin/.env.template index 11e849271..354a684a3 100644 --- a/admin/.env.template +++ b/admin/.env.template @@ -6,3 +6,6 @@ WALLET_AUTH_PATH=$WALLET_AUTH_PATH WALLET_LOGIN_PATH=$WALLET_LOGIN_PATH GRAPHQL_PATH=$GRAPHQL_PATH DEBUG_DISABLE_AUTH=false + +HUMHUB_ACTIVE=$HUMHUB_ACTIVE +HUMHUB_API_URL=$HUMHUB_API_URL \ No newline at end of file diff --git a/admin/src/components/CollapseIcon.vue b/admin/src/components/CollapseIcon.vue new file mode 100644 index 000000000..240aed498 --- /dev/null +++ b/admin/src/components/CollapseIcon.vue @@ -0,0 +1,17 @@ + + diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue index 0ae31c905..c8dc2f854 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue @@ -222,6 +222,10 @@ const onSubmit = () => { } } toastSuccess(t('message.request')) + form.value = { + text: '', + memo: props.contributionMemo, + } loading.value = false }) .catch((error) => { diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js index 7d87082d4..bbb2f3806 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js @@ -93,10 +93,12 @@ describe('ContributionMessagesList', () => { wrapper = mount(ContributionMessagesList, { props: { - contributionId: 42, - contributionMemo: 'test memo', - contributionUserId: 108, - contributionStatus: 'PENDING', + contribution: { + id: 42, + memo: 'test memo', + userId: 108, + status: 'PENDING', + }, hideResubmission: true, }, global: { @@ -137,7 +139,7 @@ describe('ContributionMessagesList', () => { }) it('does not render the ContributionMessagesFormular when status is not PENDING or IN_PROGRESS', async () => { - await wrapper.setProps({ contributionStatus: 'COMPLETED' }) + await wrapper.setProps({ contribution: { status: 'COMPLETED' } }) expect(wrapper.find('contribution-messages-formular-stub').exists()).toBe(false) }) diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue index 14b640066..9b0d11cbe 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue @@ -1,17 +1,49 @@