From 8c2b2513b0d4b725e3e0ae07d5676b5bed8d8d87 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Wed, 3 Apr 2019 12:53:52 +0200 Subject: [PATCH] Fix user popup in global activities [SCI-3285] --- app/helpers/global_activities_helper.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/helpers/global_activities_helper.rb b/app/helpers/global_activities_helper.rb index 69c9a3b69..7ca35363b 100644 --- a/app/helpers/global_activities_helper.rb +++ b/app/helpers/global_activities_helper.rb @@ -17,8 +17,10 @@ module GlobalActivitiesHelper no_links ? generate_name(value) : generate_link(value, activity) end end - sanitize_input(I18n.t("global_activities.content.#{activity.type_of}_html", - parameters.symbolize_keys)) + custom_auto_link( + I18n.t("global_activities.content.#{activity.type_of}_html", parameters.symbolize_keys), + team: activity.team + ) end def generate_link(message_item, activity) @@ -31,7 +33,7 @@ module GlobalActivitiesHelper case obj when User - return popover_for_user_name(obj, team, false, true) + return "[@#{obj.full_name}~#{obj.id.base62_encode}]" when Tag # Not link for now return current_value