render completed and info views

OSC · Nov 7, 2024 · 50b832f · 50b832f
1 parent 7e9daa7
commit 50b832f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/apps/dashboard/app/models/batch_connect/session.rb b/apps/dashboard/app/models/batch_connect/session.rb
@@ -76,7 +76,7 @@ def render_info_view
     # Return parsed markdown from completed.{md, html}.erb
     # @return [String, nil] return HTML if no error while parsing, else return nil
     def render_completed_view
-      @render_completed_view ||= OodAppkit.markdown.render(ERB.new(self.app.session_completed_view, nil, "-").result(binding)).html_safe if self.app.session_completed_view
+      @render_completed_view ||= OodAppkit.markdown.render(ERB.new(self.app.session_completed_view, trim_mode: '-').result(binding)).html_safe if self.app.session_completed_view
     rescue => e
       @render_completed_view_error_message = "Error when rendering completed view: #{e.class} - #{e.message}"
       Rails.logger.error(@render_completed_view_error_message)

diff --git a/apps/dashboard/app/views/batch_connect/sessions/card/_card_body.html.erb b/apps/dashboard/app/views/batch_connect/sessions/card/_card_body.html.erb
@@ -7,6 +7,8 @@
     <%= render_card_partial('id', session) %>
     <%= render_card_partial('support_ticket', session) if Configuration.support_ticket_enabled? %>
     <%= render_card_partial('display_choices', session) %>
+    <%= render_card_partial('custom_info_view', session) if session.app.session_info_view %>
+    <%= render_card_partial('completed_view', session) if session.app.session_completed_view &&  session.completed? %>
     <%= render_connection(session) %>
   </div>
 </div>