From: Anton Khorev Date: Mon, 16 Dec 2024 15:23:13 +0000 (+0300) Subject: Move map offline flash to partial X-Git-Tag: live~155^2~6 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/5751f8e086035b30a96dc2ccd5b54c9a15e1abde?ds=inline Move map offline flash to partial --- diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 32b53bad7..90866fe76 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 diff --git a/app/views/layouts/_offline_flash.erb b/app/views/layouts/_offline_flash.erb new file mode 100644 index 000000000..4203e3dff --- /dev/null +++ b/app/views/layouts/_offline_flash.erb @@ -0,0 +1,5 @@ +<% if %w[database_offline api_offline].include? Settings.status %> + <%= t("layouts.osm_offline") %> +<% elsif %w[database_readonly api_readonly].include? Settings.status %> + <%= t("layouts.osm_read_only") %> +<% end %>