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

Merge pull request #5802 from sboursen-scinote/sb_SCI-8866-8867

Browse source 
Fix smart annotation popover in tasks [SCI-8867]
This commit is contained in:
artoscinote 2023-07-18 15:01:48 +02:00 • committed by GitHub
commit eb37a68f27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/application_helper.rb
View file

@ -171,7 +171,7 @@ module ApplicationHelper
user_avatar_popover_absolute_url: user_avatar_absolute_url( user_avatar_popover_absolute_url: user_avatar_absolute_url(
user, user,
:thumb, :thumb,
base64_encoded_imgs base64_encoded_imgs && user.avatar.attached?
) )
}, },
formats: :html formats: :html

2
app/views/shared/_atwho_user_container.html.erb
View file

@ -21,7 +21,7 @@
data-full-name="<%= user.full_name %>" data-full-name="<%= user.full_name %>"
data-email="<%= user.email %>" data-email="<%= user.email %>"
data-popover-html="<%= popover_html %>" data-popover-html="<%= popover_html %>"
data-user-avatar-popover-absolute-url="<%= user_avatar_absolute_url(user, :thumb, user.avatar.attached?) %>" data-user-avatar-popover-absolute-url="<%= user_avatar_popover_absolute_url %>"
> >
<%= user.full_name %> <%= user.full_name %>
</a> </a>