From a2ffd74042d9809ac58c3c4dcb94a46c8d0523d2 Mon Sep 17 00:00:00 2001
From: Jesus Federico <jesus@123it.ca>
Date: Tue, 9 Oct 2018 16:16:27 -0400
Subject: [PATCH] Fixed room view broken when no format presentation is
 included (GRN-34) (#289)

---
 .../components/_public_recording_row.html.erb | 17 ++++++++------
 .../shared/components/_recording_row.html.erb | 23 +++++++++----------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/views/shared/components/_public_recording_row.html.erb b/app/views/shared/components/_public_recording_row.html.erb
index 87781a59..5f894a7a 100644
--- a/app/views/shared/components/_public_recording_row.html.erb
+++ b/app/views/shared/components/_public_recording_row.html.erb
@@ -20,14 +20,16 @@
       <%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %>
     </div>
   </td>
-  <td>
-    <% p = recording[:playbacks].find do |p| p[:type] == "presentation" end %>
-    <% if p && p.key?(:preview) && recording_thumbnails? %>
-      <% p[:preview][:images][:image].each do |img| %>
-        <%= image_tag(img[:content].strip, class: "thumbnail px-2") %>
+  <% if recording_thumbnails? %>
+    <td>
+      <% p = recording[:playbacks].find do |p| p.key?(:preview) end %>
+      <% if p %>
+        <% p[:preview][:images][:image].each do |img| %>
+          <%= image_tag(img[:content].strip, class: "thumbnail px-2") %>
+        <% end %>
       <% end %>
-    <% end %>
-  </td>
+    </td>
+  <% end %>
   <td class="text-left">
     <div class="small text-muted text-uppercase">
       <%= t("recording.table.length") %>
@@ -50,6 +52,7 @@
     </div>
   </td>
   <td>
+    <% p = recording[:playbacks].find do |p| p.key?(:length) end %>
     <% recording[:playbacks].each do |p| %>
       <%= link_to p[:type].capitalize, p[:url], class: "btn btn-sm btn-primary", target: "_blank" %>
     <% end %>
diff --git a/app/views/shared/components/_recording_row.html.erb b/app/views/shared/components/_recording_row.html.erb
index b1489b53..9eb13ba9 100644
--- a/app/views/shared/components/_recording_row.html.erb
+++ b/app/views/shared/components/_recording_row.html.erb
@@ -20,24 +20,20 @@
       <%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %>
     </div>
   </td>
-  <% p = recording[:playbacks].find do |p| p[:type] == "presentation" end %>
-  <% if p && p.key?(:preview) && recording_thumbnails? %>
+  <% if recording_thumbnails? %>
     <td>
-      <% safe_recording_images(p[:preview][:images][:image]).each do |img| %>
-        <%= image_tag(img[:content].strip, class: "thumbnail px-2") %>
+      <% p = recording[:playbacks].find do |p| p.key?(:preview) end %>
+      <% if p %>
+        <% safe_recording_images(p[:preview][:images][:image]).each do |img| %>
+          <%= image_tag(img[:content].strip, class: "thumbnail px-2") %>
+        <% end %>
       <% end %>
     </td>
   <% end %>
   <td class="text-left">
-    <div class="small text-muted text-uppercase">
-      <%= t("recording.table.length") %>
-    </div>
     <%= recording_length(recording[:playbacks]) %>
   </td>
   <td class="text-left">
-    <div class="small text-muted text-uppercase">
-      <%= t("recording.table.users") %>
-    </div>
     <%= recording[:participants] || "-" %>
   </td>
   <td class="text-left">
@@ -68,8 +64,11 @@
         <i class="fas fa-ellipsis-v px-4"></i>
       </a>
       <div class="dropdown-menu dropdown-menu-right">
-        <a class="dropdown-item email-link" data-pres-link="<%= p[:url] %>"><i class="dropdown-icon far fa-envelope"></i> <%= t("recording.email") %></a>
-        <div class="dropdown-divider"></div>
+        <% p = recording[:playbacks].find do |p| p.key?(:length) end %>
+        <% if p %>
+          <a class="dropdown-item email-link" data-pres-link="<%= p[:url] %>"><i class="dropdown-icon far fa-envelope"></i> <%= t("recording.email") %></a>
+          <div class="dropdown-divider"></div>
+        <% end %>
         <%= button_to delete_recording_path(@room, record_id: recording[:recordID]), method: :delete, class: "dropdown-item" do %>
           <i class="dropdown-icon far fa-trash-alt"></i> <%= t("delete") %>
         <% end %>