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

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

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index a69d0d57b7daaa14b9e78459a87f71de8187bc45..82966a353437d1d0a0837b527d1583c9798f11ca 100644 (file)
--- a/app/controllers/changesets_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -4,13 +4,12 @@ class ChangesetsController < ApplicationController
   layout "site"
   require "xml/libxml"
 
   layout "site"
   require "xml/libxml"
 

-  skip_before_action :verify_authenticity_token, :except => [:index]

   before_action :authorize_web
   before_action :set_locale
   before_action :authorize_web
   before_action :set_locale

+  before_action -> { check_database_readable(true) }, :only => [:index, :feed]

 
   authorize_resource
 
 
   authorize_resource
 

-  before_action(:only => [:index, :feed]) { |c| c.check_database_readable(true) }

   around_action :web_timeout
 
   # Helper methods for checking consistency
   around_action :web_timeout
 
   # Helper methods for checking consistency


@@ -54,7 +53,7 @@ class ChangesetsController < ApplicationController
       elsif @params[:bbox]
         changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
       elsif @params[:friends] && current_user
       elsif @params[:bbox]
         changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
       elsif @params[:friends] && current_user

-        changesets = changesets.where(:user_id => current_user.friend_users.identifiable)
+        changesets = changesets.where(:user_id => current_user.friends.identifiable)

       elsif @params[:nearby] && current_user
         changesets = changesets.where(:user_id => current_user.nearby)
       end
       elsif @params[:nearby] && current_user
         changesets = changesets.where(:user_id => current_user.nearby)
       end