From cb954ed60556a59f44f85fa5f67b95038a9c2e63 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 16 Oct 2023 09:54:34 +0200
Subject: [PATCH] Fix comments in shareable tasks [SCI-9476]

---
 app/helpers/secondary_navigation_helper.rb                      | 2 +-
 app/views/shareable_links/my_modules/_comments_list.html.erb    | 2 +-
 .../shareable_links/my_modules/_step_comments_sidebar.html.erb  | 2 +-
 .../shareable_links/my_modules/step_elements/_text.html.erb     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/helpers/secondary_navigation_helper.rb b/app/helpers/secondary_navigation_helper.rb
index b3c0c75bd..f41c78181 100644
--- a/app/helpers/secondary_navigation_helper.rb
+++ b/app/helpers/secondary_navigation_helper.rb
@@ -41,7 +41,7 @@ module SecondaryNavigationHelper
   end
 
   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
 
   def is_module_activities?
diff --git a/app/views/shareable_links/my_modules/_comments_list.html.erb b/app/views/shareable_links/my_modules/_comments_list.html.erb
index a0088289a..2394c13f4 100644
--- a/app/views/shareable_links/my_modules/_comments_list.html.erb
+++ b/app/views/shareable_links/my_modules/_comments_list.html.erb
@@ -1,5 +1,5 @@
 <% 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 %>">
     <% unless user == comment.user%>
       <div class="comment-header">
diff --git a/app/views/shareable_links/my_modules/_step_comments_sidebar.html.erb b/app/views/shareable_links/my_modules/_step_comments_sidebar.html.erb
index b1bbd0fba..8282ca988 100644
--- a/app/views/shareable_links/my_modules/_step_comments_sidebar.html.erb
+++ b/app/views/shareable_links/my_modules/_step_comments_sidebar.html.erb
@@ -14,7 +14,7 @@
     <div class="sidebar-body">
       <% if step.comments.present? %>
         <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>
       <% else %>
         <div class="no-comments-placeholder !block">
diff --git a/app/views/shareable_links/my_modules/step_elements/_text.html.erb b/app/views/shareable_links/my_modules/step_elements/_text.html.erb
index 3a1f5abe0..e70f2cb83 100644
--- a/app/views/shareable_links/my_modules/step_elements/_text.html.erb
+++ b/app/views/shareable_links/my_modules/step_elements/_text.html.erb
@@ -8,7 +8,7 @@
     </div>
   <% end %>
   <% 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)) %>
     </div>
   <% else %>