scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1246 from ZmagoD/zd_SCI_1334

Browse source 
adds skip_user_status parameter to popover_for_user_name function in …
This commit is contained in:
Luka Murn 2018-07-13 14:54:00 +02:00 committed by GitHub
parent 0be2fa36f0 5a1615825d
commit ba9f6e22b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/helpers/application_helper.rb
View file

@ -140,7 +140,7 @@ module ApplicationHelper
end
# Generate smart annotation link for one user object
def popover_for_user_name(user, team = nil)
def popover_for_user_name(user, team = nil, skip_user_status = false)
user_still_in_team = user.teams.include?(team)
user_description = %(<div class='col-xs-4'>
@ -166,7 +166,10 @@ module ApplicationHelper
end
user_name = user.full_name
user_name << ' ' + I18n.t('atwho.res.removed') if !user_still_in_team
unless skip_user_status || user_still_in_team
user_name << " #{I18n.t('atwho.res.removed')}"
end
raw("<img src='#{user_avatar_absolute_url(user, :icon_small)}'" \
"alt='avatar' class='atwho-user-img-popover'" \