X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/124909a64c4c2b739cebfff69fcf100e6b6d2457..e78aee9585650673e686288322fa218f0f5a1692:/app/controllers/changesets_controller.rb diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb index 22d3356b7..859242b60 100644 --- a/app/controllers/changesets_controller.rb +++ b/app/controllers/changesets_controller.rb @@ -48,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] @@ -83,7 +83,6 @@ class ChangesetsController < ApplicationController ## # if a bounding box was specified do some sanity checks. # restrict changesets to those enclosed by a bounding box - # we need to return both the changesets and the bounding box def conditions_bbox(changesets, bbox) if bbox bbox.check_boundaries