X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ca92fe3359ce2a751763b1bb0bfe824a89b20853..387d130e87b79cb428f7554c1a233de5d0627ae9:/app/controllers/site_controller.rb?ds=sidebyside diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 1cb848ea6..a05fe376b 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -7,6 +7,7 @@ class SiteController < ApplicationController before_action :redirect_browse_params, :only => :index before_action :redirect_map_params, :only => [:index, :edit, :export] before_action :require_oauth, :only => [:index] + before_action :require_user, :only => [:id] before_action :update_totp, :only => [:index] authorize_resource :class => false @@ -61,14 +62,7 @@ class SiteController < ApplicationController require_user end - if %w[potlatch potlatch2].include?(editor) - append_content_security_policy_directives( - :connect_src => %w[*], - :object_src => %w[*], - :plugin_types => %w[application/x-shockwave-flash], - :script_src => %w['unsafe-inline'] - ) - elsif %w[id].include?(editor) + if %w[id].include?(editor) append_content_security_policy_directives( :frame_src => %w[blob:] ) @@ -113,6 +107,10 @@ class SiteController < ApplicationController @locale = params[:about_locale] || I18n.locale end + def communities + @local_chapters = Community.where(:type => "osm-lc").where.not(:id => "OSMF") + end + def export; end def offline; end @@ -142,7 +140,7 @@ class SiteController < ApplicationController elsif params[:relation] redirect_to relation_path(params[:relation]) elsif params[:note] - redirect_to browse_note_path(params[:note]) + redirect_to note_path(params[:note]) elsif params[:query] redirect_to search_path(:query => params[:query]) end