forked from External/greenlight
Times are now rendered using the browsers time zone (#2438)
This commit is contained in:
@ -35,4 +35,5 @@
|
||||
//= require jquery-ui/widgets/sortable
|
||||
//= require pickr.min.js
|
||||
//= require bootstrap-select.min.js
|
||||
//= require local-time
|
||||
//= require_tree .
|
||||
|
@ -31,13 +31,6 @@ module AdminsHelper
|
||||
@running_room_bbb_ids.include?(id)
|
||||
end
|
||||
|
||||
# Returns a more friendly/readable date time object
|
||||
def friendly_time(date)
|
||||
return "" if date.nil? # Handle invalid dates
|
||||
|
||||
I18n.l date, format: "%B %d, %Y %H:%M UTC"
|
||||
end
|
||||
|
||||
# Site Settings
|
||||
|
||||
def admin_invite_registration
|
||||
|
@ -135,4 +135,10 @@ module ApplicationHelper
|
||||
def show_signin
|
||||
!@hide_signin.present?
|
||||
end
|
||||
|
||||
# Returns a more friendly/readable date time object
|
||||
def view_date(date)
|
||||
return "" if date.nil? # Handle invalid dates
|
||||
local_time(date)
|
||||
end
|
||||
end
|
||||
|
@ -17,11 +17,6 @@
|
||||
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
module RecordingsHelper
|
||||
# Helper for converting BigBlueButton dates into the desired format.
|
||||
def recording_date(date)
|
||||
I18n.l date, format: "%B %d, %Y"
|
||||
end
|
||||
|
||||
# Helper for converting BigBlueButton dates into a nice length string.
|
||||
def recording_length(playbacks)
|
||||
# Looping through playbacks array and returning first non-zero length value
|
||||
|
@ -24,7 +24,7 @@
|
||||
<div><%= user.email %></div>
|
||||
</td>
|
||||
<td>
|
||||
<div><%= friendly_time(user.updated_at) %></div>
|
||||
<div><%= view_date(user.updated_at) %></div>
|
||||
</td>
|
||||
<td>
|
||||
<div>
|
||||
|
@ -48,7 +48,7 @@
|
||||
<tr data-user-uid="<%= user.uid %>">
|
||||
<td>
|
||||
<div><%= user.name %></div>
|
||||
<div class="small text-muted"><%= [t("administrator.users.table.created"), ": ", user.created_at].join %></div>
|
||||
<div class="small text-muted"><%= [t("administrator.users.table.created"), ": ", view_date(user.created_at)].join.html_safe %></div>
|
||||
</td>
|
||||
<td class="user-email"><%= user.email && user.email != "" ? user.email : user.username%></td>
|
||||
<td><%= user.provider %></td>
|
||||
|
@ -26,7 +26,7 @@
|
||||
<a><i id="edit-record" class="fa fa-edit align-top ml-2" data-edit-recordid="<%= recording[:recordID] %>"></i></a>
|
||||
</div>
|
||||
<div class="small text-muted">
|
||||
<%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %>
|
||||
<%= t("recording.recorded_on", date: view_date(recording[:startTime])).html_safe %>
|
||||
</div>
|
||||
<div class="small text-muted">
|
||||
<%= recording_owner_email(recording[:meetingID]) %>
|
||||
|
@ -26,11 +26,11 @@
|
||||
<div class="small text-muted">
|
||||
<% running = room_is_running(room.bbb_id) %>
|
||||
<% if running %>
|
||||
<%= t("administrator.rooms.table.started", session: friendly_time(room.last_session)) %>
|
||||
<%= t("administrator.rooms.table.started", session: view_date(room.last_session)).html_safe %>
|
||||
<% elsif room.last_session.present? %>
|
||||
<%= t("administrator.rooms.table.ended", session: friendly_time(room.last_session)) %>
|
||||
<%= t("administrator.rooms.table.ended", session: view_date(room.last_session)).html_safe %>
|
||||
<% else %>
|
||||
<%= [t("administrator.users.table.created"), ": ", friendly_time(room.created_at)].join %>
|
||||
<%= [t("administrator.users.table.created"), ": ", view_date(room.created_at)].join.html_safe %>
|
||||
<% end %>
|
||||
</div>
|
||||
</td>
|
||||
|
@ -35,7 +35,7 @@
|
||||
</div>
|
||||
<div class="small text-muted">
|
||||
<% if room.sessions > 0 %>
|
||||
<i><%= t("room.last_session", session: recording_date(room.last_session)) %></i>
|
||||
<i><%= t("room.last_session", session: view_date(room.last_session)).html_safe %></i>
|
||||
<% else %>
|
||||
<i><%= t("room.no_sessions") %></i>
|
||||
<% end %>
|
||||
|
@ -26,7 +26,7 @@
|
||||
</span>
|
||||
</div>
|
||||
<div class="small text-muted">
|
||||
<%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %>
|
||||
<%= t("recording.recorded_on", date: view_date(recording[:startTime])).html_safe %>
|
||||
</div>
|
||||
</td>
|
||||
<% if recording_thumbnails? %>
|
||||
|
@ -27,7 +27,7 @@
|
||||
<a><i id="edit-record" class="fa fa-edit align-top ml-2" data-edit-recordid="<%= recording[:recordID] %>"></i></a>
|
||||
</div>
|
||||
<div class="small text-muted">
|
||||
<%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %>
|
||||
<%= t("recording.recorded_on", date: view_date(recording[:startTime])).html_safe %>
|
||||
</div>
|
||||
</td>
|
||||
<% if recording_thumbnails? %>
|
||||
|
Reference in New Issue
Block a user