X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/37f8f8a28caea936b53271c9f9de36cdbaf15d0e..29c199d581576536cd3c59026203e0c5c1ba1955:/app/controllers/changesets_controller.rb?ds=sidebyside diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb index 32d9fd733..7796dfeb2 100644 --- a/app/controllers/changesets_controller.rb +++ b/app/controllers/changesets_controller.rb @@ -4,10 +4,9 @@ class ChangesetsController < ApplicationController layout "site" require "xml/libxml" - skip_before_action :verify_authenticity_token, :except => [:index] before_action :authorize_web before_action :set_locale - before_action -> { check_database_readable(true) }, :only => [:index, :feed] + before_action -> { check_database_readable(:need_api => true) }, :only => [:index, :feed] authorize_resource @@ -54,14 +53,14 @@ class ChangesetsController < ApplicationController 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 changesets = changesets.where("changesets.id <= ?", @params[:max_id]) if @params[:max_id] - @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments) + @changesets = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments) render :action => :index, :layout => false end