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

fix reports pdf for user annotation [SCI-1051]

Browse source
This commit is contained in:
zmagod 2017-05-03 10:50:43 +02:00
parent 3735bbb0f8
commit 1b618e88e5
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/helpers/application_helper.rb
View file

@ -193,9 +193,8 @@ module ApplicationHelper
.first
end
user_description = %(<div class='col-xs-4'>
<img src='#{Rails.application.routes.url_helpers
.avatar_path(user, :thumb)}' alt='thumb'>
</div><div class='col-xs-8'>
<img src='#{set_avatar_absolute_url(user, :thumb)}'
alt='thumb'></div><div class='col-xs-8'>
<div class='row'><div class='col-xs-9 text-left'><h5>
#{user.full_name}</h5></div><div class='col-xs-3 text-right'>
<span class='glyphicon glyphicon-remove' aria-hidden='true'></span>
@ -212,8 +211,7 @@ module ApplicationHelper
user_description += %(<p></p></div></div></div>)
end
raw(image_tag(Rails.application.routes.url_helpers
.avatar_path(user, :icon_small),
raw(image_tag(set_avatar_absolute_url(user, :icon_small),
class: 'atwho-user-img-popover')) +
raw('<a onClick="$(this).popover(\'show\')" ' \
'class="atwho-user-popover" data-container="body" ' \
@ -221,4 +219,11 @@ module ApplicationHelper
'data-placement="top" data-toggle="popover" data-content="') +
raw(user_description) + raw('" >') + user.full_name + raw('</a>')
end
def set_avatar_absolute_url(user, style)
unless user.avatar(style) == '/images/icon_small/missing.png'
return user.avatar(style)
end
URI.join(root_url, "/images/#{style}/missing.png").to_s
end
end