X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..d104736809d9e36b0bc955f3425c4d47a370e78b:/app/controllers/changesets_controller.rb?ds=sidebyside diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb index 7796dfeb2..fef4d85eb 100644 --- a/app/controllers/changesets_controller.rb +++ b/app/controllers/changesets_controller.rb @@ -1,6 +1,8 @@ # The ChangesetController is the RESTful interface to Changeset objects class ChangesetsController < ApplicationController + include UserMethods + layout "site" require "xml/libxml" @@ -46,16 +48,16 @@ class ChangesetsController < ApplicationController if @params[:display_name] changesets = if user.data_public? || user == current_user - changesets.where(:user_id => user.id) + changesets.where(:user => user) else changesets.where("false") end elsif @params[:bbox] changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params)) elsif @params[:friends] && current_user - changesets = changesets.where(:user_id => current_user.friends.identifiable) + changesets = changesets.where(:user => current_user.friends.identifiable) elsif @params[:nearby] && current_user - changesets = changesets.where(:user_id => current_user.nearby) + changesets = changesets.where(:user => current_user.nearby) end changesets = changesets.where("changesets.id <= ?", @params[:max_id]) if @params[:max_id]