lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed room view broken when no format presentation is included (GRN-34) (#289)

This commit is contained in:
Jesus Federico 2018-10-09 16:16:27 -04:00 committed by GitHub
parent 99fb4cc478
commit a2ffd74042
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/views/shared/components/_public_recording_row.html.erb
View File

@ -20,14 +20,16 @@
<%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %> <%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %>
</div> </div>
</td> </td>
<td> <% if recording_thumbnails? %>
<% p = recording[:playbacks].find do |p| p[:type] == "presentation" end %> <td>
<% if p && p.key?(:preview) && recording_thumbnails? %> <% p = recording[:playbacks].find do |p| p.key?(:preview) end %>
<% p[:preview][:images][:image].each do |img| %> <% if p %>
<%= image_tag(img[:content].strip, class: "thumbnail px-2") %> <% p[:preview][:images][:image].each do |img| %>
<%= image_tag(img[:content].strip, class: "thumbnail px-2") %>
<% end %>
<% end %> <% end %>
<% end %> </td>
</td> <% end %>
<td class="text-left"> <td class="text-left">
<div class="small text-muted text-uppercase"> <div class="small text-muted text-uppercase">
<%= t("recording.table.length") %> <%= t("recording.table.length") %>
@ -50,6 +52,7 @@
</div> </div>
</td> </td>
<td> <td>
<% p = recording[:playbacks].find do |p| p.key?(:length) end %>
<% recording[:playbacks].each do |p| %> <% recording[:playbacks].each do |p| %>
<%= link_to p[:type].capitalize, p[:url], class: "btn btn-sm btn-primary", target: "_blank" %> <%= link_to p[:type].capitalize, p[:url], class: "btn btn-sm btn-primary", target: "_blank" %>
<% end %> <% end %>

23
app/views/shared/components/_recording_row.html.erb
View File

@ -20,24 +20,20 @@
<%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %> <%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %>
</div> </div>
</td> </td>
<% p = recording[:playbacks].find do |p| p[:type] == "presentation" end %> <% if recording_thumbnails? %>
<% if p && p.key?(:preview) && recording_thumbnails? %>
<td> <td>
<% safe_recording_images(p[:preview][:images][:image]).each do |img| %> <% p = recording[:playbacks].find do |p| p.key?(:preview) end %>
<%= image_tag(img[:content].strip, class: "thumbnail px-2") %> <% if p %>
<% safe_recording_images(p[:preview][:images][:image]).each do |img| %>
<%= image_tag(img[:content].strip, class: "thumbnail px-2") %>
<% end %>
<% end %> <% end %>
</td> </td>
<% end %> <% end %>
<td class="text-left"> <td class="text-left">
<div class="small text-muted text-uppercase">
<%= t("recording.table.length") %>
</div>
<%= recording_length(recording[:playbacks]) %> <%= recording_length(recording[:playbacks]) %>
</td> </td>
<td class="text-left"> <td class="text-left">
<div class="small text-muted text-uppercase">
<%= t("recording.table.users") %>
</div>
<%= recording[:participants] || "-" %> <%= recording[:participants] || "-" %>
</td> </td>
<td class="text-left"> <td class="text-left">
@ -68,8 +64,11 @@
<i class="fas fa-ellipsis-v px-4"></i> <i class="fas fa-ellipsis-v px-4"></i>
</a> </a>
<div class="dropdown-menu dropdown-menu-right"> <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> <% p = recording[:playbacks].find do |p| p.key?(:length) end %>
<div class="dropdown-divider"></div> <% 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 %> <%= 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") %> <i class="dropdown-icon far fa-trash-alt"></i> <%= t("delete") %>
<% end %> <% end %>