diff --git a/backend/public/email-templates/action-email-activation.njk b/backend/public/email-templates/action-email-activation.njk index 3cff7f318..0ef8aa07f 100644 --- a/backend/public/email-templates/action-email-activation.njk +++ b/backend/public/email-templates/action-email-activation.njk @@ -98,7 +98,7 @@ table[class=body] .article { -

{{ textContent }}

+

{{ textContent | replace(' Primary Keys: ' ~ primaryKeysValuesStr, '') | trim }}

Primary Keys: {{ primaryKeysValuesStr }}

diff --git a/backend/src/entities/email/email/email.service.ts b/backend/src/entities/email/email/email.service.ts index 007fc5545..27e53617f 100644 --- a/backend/src/entities/email/email/email.service.ts +++ b/backend/src/entities/email/email/email.service.ts @@ -56,12 +56,7 @@ export class EmailService { : triggerOperation === TableActionEventEnum.DELETE_ROW ? 'deleted a row' : 'performed an action'; - const textContent = EMAIL_TEXT.ACTION_EMAIL.EMAIL_TEXT( - userInfo, - triggerOperation, - tableName, - primaryKeyValuesArray, - ); + const textContent = EMAIL_TEXT.ACTION_EMAIL.EMAIL_TEXT(userInfo, action, tableName, primaryKeyValuesArray); const primaryKeysValuesStr = JSON.stringify(primaryKeyValuesArray); const letterContent: IMessage = { @@ -76,6 +71,8 @@ export class EmailService { action, primaryKeysValuesStr, currentYear, + textContent, + primaryKeyValuesArray, }), }; return await this.sendEmailToUser(letterContent);