Merge remote-tracking branch 'upstream/pull/3911'

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 17353fe96ddc398bc6c42730bd4f0882e3e47772..a05fe376be5ae27a193244dade2fac409c9a169e 100644 (file)
--- 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
@@ -107,8 +108,7 @@ class SiteController < ApplicationController
   end
 
   def communities
-    @locale = I18n.locale
-    @local_chapters = OsmCommunityIndex::LocalChapter.local_chapters_with_locale(@locale)
+    @local_chapters = Community.where(:type => "osm-lc").where.not(:id => "OSMF")
   end
 
   def export; end
@@ -140,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