Merge branch 'v2'

This commit is contained in:
jfederico
2019-07-29 14:30:30 +00:00
7 changed files with 12 additions and 46 deletions

View File

@ -36,9 +36,6 @@ class ApplicationController < ActionController::Base
# Manually handle BigBlueButton errors
rescue_from BigBlueButton::BigBlueButtonException, with: :handle_bigbluebutton_error
# Manually Handle errors when application is in readonly mode
rescue_from ActiveRecord::ReadOnlyRecord, with: :handle_readonly_error
protect_from_forgery with: :exception
MEETING_NAME_LIMIT = 90
@ -56,7 +53,7 @@ class ApplicationController < ActionController::Base
end
def maintenance_mode?
if ENV["MAINTENANCE_MODE"] == "full"
if ENV["MAINTENANCE_MODE"] == "true"
render "errors/greenlight_error", status: 503, formats: :html,
locals: {
status_code: 503,
@ -202,10 +199,4 @@ class ApplicationController < ActionController::Base
def handle_bigbluebutton_error
render "errors/bigbluebutton_error"
end
# Manually Handle errors when application is in readonly mode
def handle_readonly_error
flash.clear
redirect_to request.referrer || root_path, flash: { alert: I18n.t("errors.maintenance.readonly") }
end
end