Move map offline flash to partial

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 32b53bad71c3f431d79234d65e354f6cafcf13c9..90866fe76986a9805f2ed680d429a265eb2bf86f 100644 (file)
--- 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 (file)
index 0000000..4203e3d
--- /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 %>