X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/47a8907e2a622804ac400be8f4e7ec611f006c87..6edb8dae058979f9c5cb198ad4f7af3f700ba84b:/app/controllers/application_controller.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 40f02300a..a7235241c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -259,12 +259,7 @@ class ApplicationController < ActionController::Base request.content_security_policy = policy - case Settings.status - when "database_offline", "api_offline" - flash.now[:warning] = t("layouts.osm_offline") - when "database_readonly", "api_readonly" - flash.now[:warning] = t("layouts.osm_read_only") - end + flash.now[:warning] = { :partial => "layouts/offline_flash" } unless api_status == "online" request.xhr? ? "xhr" : "map" end @@ -304,10 +299,7 @@ class ApplicationController < ActionController::Base end def deny_access(_exception) - if doorkeeper_token - set_locale - report_error t("oauth.permissions.missing"), :forbidden - elsif current_user + if current_user set_locale respond_to do |format| format.html { redirect_to :controller => "/errors", :action => "forbidden" }