From 60a9bd1f4e7430df39b938f8555786eaee95adf0 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 20 Oct 2022 06:20:14 +0200 Subject: [PATCH 1/4] changed text --- frontend/src/locales/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index a9ad47911..a9aee274d 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -34,7 +34,7 @@ "contribution": { "activity": "Tätigkeit", "alert": { - "answerQuestion": "Bitte beantworte die Nachfrage", + "answerQuestion": "Bitte beantworte die Rückfrage!", "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.", "confirm": "bestätigt", "in_progress": "Es gibt eine Rückfrage der Moderatoren.", From a4bf122bf4855dcfdaabda249db9d85d21a9907c Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 20 Oct 2022 11:46:19 +0200 Subject: [PATCH 2/4] change E-Mail Subject --- backend/src/mailer/sendAddedContributionMessageEmail.test.ts | 2 +- backend/src/mailer/text/contributionMessageReceived.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts index 1151a0abc..bed8f6214 100644 --- a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts +++ b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts @@ -26,7 +26,7 @@ describe('sendAddedContributionMessageEmail', () => { it('calls sendEMail', () => { expect(sendEMail).toBeCalledWith({ to: `Bibi Bloxberg `, - subject: 'Gradido Frage zur Schöpfung', + subject: 'Rückfrage zu Deinem Gemeinwohl-Beitrag', text: expect.stringContaining('Hallo Bibi Bloxberg') && expect.stringContaining('Peter Lustig') && diff --git a/backend/src/mailer/text/contributionMessageReceived.ts b/backend/src/mailer/text/contributionMessageReceived.ts index b0c9c4d30..af1cabb9f 100644 --- a/backend/src/mailer/text/contributionMessageReceived.ts +++ b/backend/src/mailer/text/contributionMessageReceived.ts @@ -1,6 +1,6 @@ export const contributionMessageReceived = { de: { - subject: 'Gradido Frage zur Schöpfung', + subject: 'Rückfrage zu Deinem Gemeinwohl-Beitrag', text: (data: { senderFirstName: string senderLastName: string From 6970cc1725db2aed262afd26d508f4b4d243f2ef Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 20 Oct 2022 11:51:37 +0200 Subject: [PATCH 3/4] fix: Include Deleted Email Contacts in User Search --- backend/src/typeorm/repository/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts index 8b3e29859..c20ef85ff 100644 --- a/backend/src/typeorm/repository/User.ts +++ b/backend/src/typeorm/repository/User.ts @@ -28,8 +28,8 @@ export class UserRepository extends Repository { ): Promise<[DbUser[], number]> { const query = this.createQueryBuilder('user') .select(select) - .leftJoinAndSelect('user.emailContact', 'emailContact') .withDeleted() + .leftJoinAndSelect('user.emailContact', 'emailContact') .where( new Brackets((qb) => { qb.where( From 6c94dae7b1907f7731d7d41b5e9efe7f3078adb2 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 20 Oct 2022 13:36:47 +0200 Subject: [PATCH 4/4] fix Pagination Contributions jumps to wrong Page --- frontend/src/pages/Community.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue index c98bfff2d..786307405 100644 --- a/frontend/src/pages/Community.vue +++ b/frontend/src/pages/Community.vue @@ -231,8 +231,6 @@ export default { this.items = listContributions.contributionList if (this.items.find((item) => item.state === 'IN_PROGRESS')) { this.tabIndex = 1 - } else { - this.tabIndex = 0 } }) .catch((err) => {