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

Fix comments in shareable tasks [SCI-9476]

Browse source
This commit is contained in:
Anton 2023-10-16 09:54:34 +02:00
parent 0a5686d9bc
commit cb954ed605
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/secondary_navigation_helper.rb
View file

@ -41,7 +41,7 @@ module SecondaryNavigationHelper
end end
def is_module_results? def is_module_results?
%w(index).include?(action_name) && controller_name == 'results' (%w(index).include?(action_name) && controller_name == 'results') || action_name == 'results_show'
end end
def is_module_activities? def is_module_activities?

2
app/views/shareable_links/my_modules/_comments_list.html.erb
View file

@ -1,5 +1,5 @@
<% user= nil %> <% user= nil %>
<% oject.comments.order(created_at: :asc).each do |comment| %> <% object.comments.order(created_at: :asc).each do |comment| %>
<div class="comment-container" data-comment-id="<%= comment.id %>"> <div class="comment-container" data-comment-id="<%= comment.id %>">
<% unless user == comment.user%> <% unless user == comment.user%>
<div class="comment-header"> <div class="comment-header">

2
app/views/shareable_links/my_modules/_step_comments_sidebar.html.erb
View file

@ -14,7 +14,7 @@
<div class="sidebar-body"> <div class="sidebar-body">
<% if step.comments.present? %> <% if step.comments.present? %>
<div class="comments-list"> <div class="comments-list">
<%= render partial: "shareable_links/my_modules/comments_list", locals: { step: step } %> <%= render partial: "shareable_links/my_modules/comments_list", locals: { object: step } %>
</div> </div>
<% else %> <% else %>
<div class="no-comments-placeholder !block"> <div class="no-comments-placeholder !block">

2
app/views/shareable_links/my_modules/step_elements/_text.html.erb
View file

@ -8,7 +8,7 @@
</div> </div>
<% end %> <% end %>
<% if element.text.present? %> <% if element.text.present? %>
<div class="flex rounded min-h-[2.25rem] mb-4 relative group/text_container content__text-body max-w-[90ch]"> <div class="rounded min-h-[2.25rem] mb-4 relative group/text_container content__text-body max-w-[90ch]">
<%= smart_annotation_text(element.shareable_tinymce_render(:text)) %> <%= smart_annotation_text(element.shareable_tinymce_render(:text)) %>
</div> </div>
<% else %> <% else %>