Refactor terms declined flash message to use a partial

[rails.git] / app / controllers / export_controller.rb

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index afdf4d8d7e38005f89c310d2f8bf9f0033d84cbb..d901dccc9e9a721570c1d91360e9e9ce420c1bf5 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -2,6 +2,7 @@ class ExportController < ApplicationController
   before_action :authorize_web
   before_action :set_locale
   before_action :update_totp, :only => [:finish]
   before_action :authorize_web
   before_action :set_locale
   before_action :update_totp, :only => [:finish]

+  authorize_resource :class => false

 
   caches_page :embed
 
 
   caches_page :embed
 


@@ -10,11 +11,12 @@ class ExportController < ApplicationController
     bbox = BoundingBox.from_lon_lat_params(params)
     format = params[:format]
 
     bbox = BoundingBox.from_lon_lat_params(params)
     format = params[:format]
 

-    if format == "osm"
+    case format
+    when "osm"

       # redirect to API map get
       # redirect to API map get

-      redirect_to :controller => "api", :action => "map", :bbox => bbox
+      redirect_to :controller => "api/map", :action => "index", :bbox => bbox

 
 

-    elsif format == "mapnik"
+    when "mapnik"

       # redirect to a special 'export' cgi script
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
       # redirect to a special 'export' cgi script
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]


@@ -23,5 +25,9 @@ class ExportController < ApplicationController
     end
   end
 
     end
   end
 

-  def embed; end
+  def embed
+    append_content_security_policy_directives(
+      :frame_ancestors => %w[*]
+    )
+  end

 end
 end