diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue index 9c40bff06..2c3ae9ecd 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue @@ -163,21 +163,18 @@ export default { this.$apollo .mutate({ mutation, variables }) .then((result) => { + this.$el.ownerDocument.defaultView.console.log('after calling mutation') if ( this.hideResubmission && this.showResubmissionDate && this.combineResubmissionDateAndTime() > new Date() ) { + this.$el.ownerDocument.defaultView.console.log('before update-contributions') this.$emit('update-contributions') } else { - this.$emit('update-status', this.contributionId) - if (this.tabindex === 2) { - this.$emit('reload-contribution', this.contributionId) - } else { - this.$emit('get-list-contribution-messages', this.contributionId) - } - } - this.onReset() + this.$el.ownerDocument.defaultView.console.log('before reload contribution') + this.$emit('reload-contribution', this.contributionId) + } this.toastSuccess(this.$t('message.request')) this.loading = false }) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index a0cd9a8a3..5206d6316 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -142,6 +142,7 @@ export default { }, methods: { reloadContribution(id) { + console.log('reload contribution with id: %d', id) this.$apollo .query({ query: getContribution, variables: { id } }) .then((result) => { diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts index a4fe14c37..8435052dd 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts @@ -148,13 +148,14 @@ export class ContributionMessageResolver { async (transactionalEntityManager: EntityManager) => { const { contribution, contributionMessage, contributionChanged } = await updateUnconfirmedContributionContext.run(transactionalEntityManager, relations) - + console.log('contribution changed: %d', contributionChanged) if (contributionChanged) { await transactionalEntityManager.update( - Contribution, + DbContribution, { id: contributionId }, contribution, ) + console.log('new contribution resubmission at: %s, status: %s', contribution.resubmissionAt, contribution.contributionStatus) } if (contributionMessage) { await transactionalEntityManager.insert(DbContributionMessage, contributionMessage) diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts index dcf053feb..c8c8e35bc 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts @@ -29,8 +29,10 @@ export class UnconfirmedContributionAdminAddMessageRole extends AbstractUnconfir ) { this.self.contributionStatus = newStatus this.self.resubmissionAt = resubmissionDate + console.log('update, change status and/or resubmissionAt') } else { this.changed = false + console.log('no changes, resubmission date: %s', resubmissionDate?.toString()) } }