GRN2-217: Fixes issues with recording rows and localization (fixed #703-#705) (#707)

* Fixes issues with recording rows

* Fixed small typo related to logs
This commit is contained in:
farhatahmad
2019-07-31 11:45:15 -04:00
committed by Jesus Federico
parent d123d5add0
commit 02b342b157
8 changed files with 23 additions and 20 deletions

View File

@ -24,7 +24,7 @@ class UsersController < ApplicationController
include Recorder
before_action :find_user, only: [:edit, :update, :destroy]
before_action :ensure_unauthenticated, only: [:new, :create]
before_action :ensure_unauthenticated, only: [:new, :create, :signin]
# POST /u
def create

View File

@ -21,7 +21,7 @@ module RecordingsHelper
# Helper for converting BigBlueButton dates into the desired format.
def recording_date(date)
date.strftime("%B #{date.day.ordinalize}, %Y.")
I18n.l date, format: "%B %d, %Y"
end
# Helper for converting BigBlueButton dates into a nice length string.
@ -32,7 +32,7 @@ module RecordingsHelper
len = valid_playbacks.first[:length]
if len > 60
"#{(len / 60).to_i} hrs #{len % 60} mins"
"#{(len / 60).to_i} h #{len % 60} min"
elsif len.zero?
"< 1 min"
else

View File

@ -29,7 +29,7 @@
</div>
</td>
<% if recording_thumbnails? %>
<td>
<td class="overflow-hidden">
<% p = recording[:playbacks].find do |p| p.key?(:preview) end %>
<% if p %>
<% p[:preview][:images][:image].each do |img| %>
@ -39,15 +39,9 @@
</td>
<% end %>
<td id="recording-length" class="text-left" data-full-length="<%=recording[:playbacks].first[:length]%>">
<div class="small text-muted text-uppercase">
<%= t("recording.table.length") %>
</div>
<%= recording_length(recording[:playbacks]) %>
</td>
<td id="recording-users" class="text-left">
<div class="small text-muted text-uppercase">
<%= t("recording.table.users") %>
</div>
<%= recording[:participants] %>
</td>
<td class="text-left">

View File

@ -30,7 +30,7 @@
</div>
</td>
<% if recording_thumbnails? %>
<td>
<td class="overflow-hidden">
<% p = recording[:playbacks].find do |p| p.key?(:preview) end %>
<% if p %>
<% safe_recording_images(p[:preview][:images][:image]).each do |img| %>