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

Added a flash message if the getMeetings call times out (#2232)

This commit is contained in:
Ahmad Farhat 2020-10-26 14:38:19 -04:00 committed by GitHub
parent 3880e932bb
commit 68716bc6f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/admins_controller.rb
View File

@ -71,7 +71,13 @@ class AdminsController < ApplicationController
@order_column = params[:column] && params[:direction] != "none" ? params[:column] : "status" @order_column = params[:column] && params[:direction] != "none" ? params[:column] : "status"
@order_direction = params[:direction] && params[:direction] != "none" ? params[:direction] : "DESC" @order_direction = params[:direction] && params[:direction] != "none" ? params[:direction] : "DESC"
begin
meetings = all_running_meetings[:meetings] meetings = all_running_meetings[:meetings]
rescue
flash[:alert] = I18n.t("administrator.rooms.timeout")
meetings = []
end
@order_column = "created_at" if meetings.empty? @order_column = "created_at" if meetings.empty?
@running_room_bbb_ids = meetings.pluck(:meetingID) @running_room_bbb_ids = meetings.pluck(:meetingID)

1
config/locales/en.yml
View File

@ -173,6 +173,7 @@ en:
enabled: Always Enabled enabled: Always Enabled
optional: Optional optional: Optional
rooms: rooms:
timeout: Due to the BigBlueButton Server request timing out, the information for status and participants may not be accurate
title: Server Rooms title: Server Rooms
table: table:
ended: "Ended: %{session}" ended: "Ended: %{session}"