Merge branch 'master' into feature/add-communities-page

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index a73d1e2e50e74f9595605917440a60a5cf7ba4f5..9d9cf0f39578c78951c0aa4eb7632c452ab7f44f 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
-    OsmCommunityIndex::LocalChapter.add_to_i18n # this should be called on app init
-    @local_chapters = OsmCommunityIndex::LocalChapter.local_chapters
+    @local_chapters = Community.where(:type => "osm-lc").where.not(:id => "OSMF")
   end
 
   def export; end