X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e91956d0f7ea6f2b0719a1459110ad3a09d2ee9a..b5825b2f64d3fbbeeefa9873f6bf9b2a434e55d1:/app/controllers/changeset_controller.rb diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index 6a0ad40a7..63f9f0f7d 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -279,20 +279,14 @@ class ChangesetController < ApplicationController else changesets = changesets.where("false") end - end - - if params[:friends] && @user + elsif params[:bbox] + changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params)) + elsif params[:friends] && @user changesets = changesets.where(:user_id => @user.friend_users.public) - end - - if params[:nearby] && @user + elsif params[:nearby] && @user changesets = changesets.where(:user_id => @user.nearby) end - if params[:bbox] - changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params)) - end - if params[:max_id] changesets = changesets.where("changesets.id <= ?", params[:max_id]) end