From 4d69e39b57e24405c51d5ae6d51cd4c0425832c4 Mon Sep 17 00:00:00 2001
From: einhornimmond <dario.rekowski@gmx.de>
Date: Wed, 29 Nov 2023 11:44:55 +0100
Subject: [PATCH] fix some bugs

---
 .../ContributionMessages/ContributionMessagesFormular.vue   | 6 ++++--
 admin/src/locales/de.json                                   | 2 +-
 admin/src/locales/en.json                                   | 2 +-
 backend/src/graphql/resolver/ContributionMessageResolver.ts | 2 +-
 .../UnconfirmedContributionAdmin.role.ts                    | 4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index b3687a38d..9c40bff06 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -36,7 +36,7 @@
             <b-form-textarea
               id="textarea"
               v-model="form.text"
-              :placeholder="$t('contributionLink.memo')"
+              :placeholder="$t('moderator.notice')"
               rows="3"
             ></b-form-textarea>
           </b-tab>
@@ -138,7 +138,6 @@ export default {
       this.loading = true
       let mutation
       const variables = {
-        id: this.contributionId,
         resubmissionAt: this.showResubmissionDate
           ? this.combineResubmissionDateAndTime().toString()
           : null,
@@ -146,6 +145,7 @@ export default {
       // update only resubmission date?
       if (this.form.text === '' && this.form.memo === this.contributionMemo) {
         mutation = adminUpdateContribution
+        variables.id = this.contributionId
       }
       // update tabindex 0 = dialog or 1 = moderator
       else if (this.tabindex !== 2) {
@@ -153,10 +153,12 @@ export default {
         variables.message = this.form.text
         variables.messageType =
           this.tabindex === 0 ? this.messageType.DIALOG : this.messageType.MODERATOR
+        variables.contributionId = this.contributionId
         // update contribution memo
       } else {
         mutation = adminUpdateContribution
         variables.memo = this.form.memo
+        variables.id = this.contributionId
       }
       this.$apollo
         .mutate({ mutation, variables })
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index bdb616001..76da78f72 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -119,7 +119,7 @@
     "notice-tooltip": "Die Notiz ist nur für Moderatoren sichtbar",
     "memo": "Text ändern",
     "memo-tooltip": "Den Beitragstext bearbeiten",
-    "memo-modified": "Memo vom Moderator bearbeitet",
+    "memo-modified": "Text vom Moderator bearbeitet.",
     "message": "Nachricht",
     "message-tooltip": "Nachricht an Benutzer schreiben",
     "request": "Diese Nachricht ist nur für die Moderatoren sichtbar!"
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index f692689ca..d771dd54c 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -119,7 +119,7 @@
     "notice-tooltip": "The note is only visible to moderators",
     "memo": "Edit text",
     "memo-tooltip": "Edit the text of the contribution",
-    "memo-modified": "Memo edited by moderator",
+    "memo-modified": "Text edited by moderator",
     "message": "Message",
     "message-tooltip": "Write message to user",
     "request": "This message is only visible to the moderators!"
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index f4ca1abeb..a4fe14c37 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -157,7 +157,7 @@ export class ContributionMessageResolver {
             )
           }
           if (contributionMessage) {
-            await transactionalEntityManager.insert(ContributionMessage, contributionMessage)
+            await transactionalEntityManager.insert(DbContributionMessage, contributionMessage)
           }
           finalContribution = contribution
           finalContributionMessage = contributionMessage
diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts
index 7af03124d..734c4d78d 100644
--- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts
+++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts
@@ -25,7 +25,7 @@ export class UnconfirmedContributionAdminRole extends AbstractUnconfirmedContrib
 
   /**
    *
-   * @returns true if memo, amount and creation date are not changed at all
+   * @returns true if memo, amount or creation date are changed
    */
   private isContributionChanging(): boolean {
     if (this.wasUpdateAlreadyCalled()) {
@@ -80,7 +80,7 @@ export class UnconfirmedContributionAdminRole extends AbstractUnconfirmedContrib
 
     // creation date is currently not changeable
     if (
-      this.isContributionChanging() &&
+      !this.isContributionChanging() &&
       ((this.self.resubmissionAt === null && newResubmissionDate === null) ||
         resubmissionNotChanged)
     ) {