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

Activities - Issues after rails upgrade [SCI-8824] (#5755)

Browse source
This commit is contained in:
G-Chubinidze 2023-07-12 13:11:10 +04:00 • committed by GitHub
parent 2f669c93d5
commit ac399e5722
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/global_activities_controller.rb
View file

@ -58,7 +58,7 @@ class GlobalActivitiesController < ApplicationController
respond_to do |format| respond_to do |format|
format.json do format.json do
render json: { render json: {
activities_html: render_to_string(partial: 'activity_list'), activities_html: render_to_string(partial: 'activity_list', formats: :html),
next_page: @next_page, next_page: @next_page,
starting_timestamp: @starting_timestamp starting_timestamp: @starting_timestamp
} }

6
app/views/shared/_atwho_user_container.erb
View file

@ -21,14 +21,14 @@
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_popover_absolute_url %>" data-user-avatar-popover-absolute-url="<%= user_avatar_absolute_url(user, :thumb, true) %>"
> >
<% unless skip_avatar %> <% unless skip_avatar %>
<span class="global-avatar-container smart-annotation"> <span class="global-avatar-container smart-annotation">
<img <img
src="<%= user_avatar_absolute_url %>" src="<%= user_avatar_absolute_url(user, :icon_small, true) %>"
alt="avatar" class="atwho-user-img-popover" alt="avatar" class="atwho-user-img-popover"
ref="<%= 'missing-img' unless user.avatar.attached? %>%"> ref="<%= 'missing-img' unless user.avatar.attached? %>">
</span> </span>
<% end %> <% end %>
<%= user.full_name %> <%= user.full_name %>