scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-27 02:04:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix user popup in global activities [SCI-3285]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2019-04-03 12:53:52 +02:00
parent 01ffb43c23
commit 8c2b2513b0
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/helpers/global_activities_helper.rb
View file

@ -17,8 +17,10 @@ module GlobalActivitiesHelper
no_links ? generate_name(value) : generate_link(value, activity) no_links ? generate_name(value) : generate_link(value, activity)
end end
end end
sanitize_input(I18n.t("global_activities.content.#{activity.type_of}_html", custom_auto_link(
parameters.symbolize_keys)) I18n.t("global_activities.content.#{activity.type_of}_html", parameters.symbolize_keys),
team: activity.team
)
end end
def generate_link(message_item, activity) def generate_link(message_item, activity)
@ -31,7 +33,7 @@ module GlobalActivitiesHelper
case obj case obj
when User when User
return popover_for_user_name(obj, team, false, true) return "[@#{obj.full_name}~#{obj.id.base62_encode}]"
when Tag when Tag
# Not link for now # Not link for now
return current_value return current_value