From b8b675367709fc6af5e8f9457cfb794ecba0d979 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 17 Jan 2023 14:44:18 +0100 Subject: [PATCH] Reviewed change requests. --- admin/src/locales/en.json | 2 +- backend/src/graphql/resolver/ContributionResolver.ts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index b82efd42f..bcaa50dab 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -56,7 +56,7 @@ "deleted": "deleted", "deleted_user": "All deleted user", "delete_user": "Delete user", - "deny": "Refuse", + "deny": "Deny", "edit": "Edit", "enabled": "enabled", "error": "Error", diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index 6d8318b72..3546c7c03 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -725,7 +725,11 @@ export class ContributionResolver { @Arg('id', () => Int) id: number, @Ctx() context: Context, ): Promise { - const contributionToUpdate = await DbContribution.findOne({ id }) + const contributionToUpdate = await DbContribution.findOne({ + id, + confirmedAt: IsNull(), + deniedBy: IsNull(), + }) // TODO: Check // - contribution exists // - state has accept one