From 0e0f7fe0dae41977a9d49b58c73354b037fd2ab1 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Wed, 27 Dec 2023 12:19:19 +0400 Subject: [PATCH] Missing links in notifications & emails for adding and removing a user to the team [SCI-9880] --- app/helpers/notifications_helper.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb index 42d13db8a..8a2836aad 100644 --- a/app/helpers/notifications_helper.rb +++ b/app/helpers/notifications_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module NotificationsHelper def send_email_notification(user, notification) AppMailer.delay.notification(user.id, notification) @@ -10,20 +12,25 @@ module NotificationsHelper unassigned_user: target_user.name, team: team.name, unassigned_by_user: user.name) + message = team.name + if role title = I18n.t('notifications.assign_user_to_team', assigned_user: target_user.name, role: role, team: team.name, assigned_by_user: user.name) + message = ActionController::Base.helpers.sanitize( + "#{team.name}" + ) + end - message = "#{I18n.t('search.index.team')} #{team.name}" end GeneralNotification.send_notifications({ type: role ? :invite_user_to_team : :remove_user_from_team, title: sanitize_input(title), - message: sanitize_input(message), + message: message, user: target_user }) end