Merge pull request #246 from joshua-arts/disable-thumbnails-config

Add option to disable recording thumbnails.
This commit is contained in:
Joshua Arts 2018-08-17 16:43:07 -04:00 committed by GitHub
commit ffcc841fe7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 7 deletions

View File

@ -70,6 +70,11 @@ class ApplicationController < ActionController::Base
end
helper_method :loadbalanced_configuration?
def recording_thumbnails?
Rails.configuration.recording_thumbnails
end
helper_method :recording_thumbnails?
def allow_greenlight_users?
Rails.configuration.greenlight_accounts
end

View File

@ -25,7 +25,9 @@
<thead>
<tr>
<th><%= t("recording.table.name") %></th>
<th><%= t("recording.table.thumbnails") %></th>
<% if recording_thumbnails? %>
<th><%= t("recording.table.thumbnails") %></th>
<% end %>
<th class="text-left"><%= t("recording.table.length") %></th>
<th class="text-left"><%= t("recording.table.users") %></th>
<th class="text-left"><%= t("recording.table.visibility") %></th>

View File

@ -22,7 +22,7 @@
</td>
<td>
<% p = recording[:playbacks].find do |p| p[:type] == "presentation" end %>
<% if p %>
<% if p && p.key?(:preview) && recording_thumbnails? %>
<% p[:preview][:images][:image].each do |img| %>
<%= image_tag(img[:content].strip, class: "thumbnail px-2") %>
<% end %>

View File

@ -20,14 +20,14 @@
<%= 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 = recording[:playbacks].find do |p| p[:type] == "presentation" end %>
<% if p && p.key?(:preview) && recording_thumbnails? %>
<td>
<% safe_recording_images(p[:preview][:images][:image]).each do |img| %>
<%= image_tag(img[:content].strip, class: "thumbnail px-2") %>
<% end %>
<% end %>
</td>
</td>
<% end %>
<td class="text-left">
<div class="small text-muted text-uppercase">
<%= t("recording.table.length") %>

View File

@ -76,5 +76,8 @@ module Greenlight
# Configure custom branding image.
config.branding_image = ENV['BRANDING_IMAGE']
# Enable/disable recording thumbnails.
config.recording_thumbnails = (ENV['RECORDING_THUMBNAILS'] != "false")
end
end