scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-01 20:48:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix user smart annotations [SCI-7219]

Browse source
This commit is contained in:
Martin Artnik 2022-09-16 16:08:36 +02:00
parent 37345e9225
commit e99e021479
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/helpers/application_helper.rb
View file

@ -162,12 +162,12 @@ module ApplicationHelper
</div></div><div class='row'><div class='col-xs-12'>
<p class='silver'>#{user.email}</p>)
if user_still_in_team
user_t = user.teams.find_by(id: team)
user_team_assignment = user.user_assignments.find_by(assignable: team)
user_description += %(<p>
#{I18n.t('atwho.users.popover_html',
role: user_t.role.capitalize,
team: user_t.team.name,
time: I18n.l(user_t.created_at, format: :full_date))}
role: user_team_assignment.user_role.name.capitalize,
team: user_team_assignment.assignable.name,
time: I18n.l(user_team_assignment.created_at, format: :full_date))}
</p></div></div></div>)
else
user_description += %(<p></p></div></div></div>)