X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/78db9e72bb3653ee8c666f5d10a231aecad9d984..c3f73a80287b35a43ca15d83c9cb2b70606ce7c5:/app/controllers/changeset_controller.rb?ds=sidebyside diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index 941c54d49..495fcee97 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -271,8 +271,17 @@ class ChangesetController < ApplicationController if @user changesets = changesets.where(:user_id => @user.friend_users.public) elsif request.format == :html - @title = t 'user.no_such_user.title' - render :template => 'user/no_such_user', :status => :not_found + require_user + return + end + end + + if params[:nearby] + if @user + changesets = changesets.where(:user_id => @user.nearby) + elsif request.format == :html + require_user + return end end @@ -291,10 +300,14 @@ class ChangesetController < ApplicationController user_link = render_to_string :partial => "user", :object => user end - if params[:friends] and user + if params[:friends] and @user @title = t 'changeset.list.title_friend' @heading = t 'changeset.list.heading_friend' @description = t 'changeset.list.description_friend' + elsif params[:nearby] and @user + @title = t 'changeset.list.title_nearby' + @heading = t 'changeset.list.heading_nearby' + @description = t 'changeset.list.description_nearby' elsif user and bbox @title = t 'changeset.list.title_user_bbox', :user => user.display_name, :bbox => bbox.to_s @heading = t 'changeset.list.heading_user_bbox', :user => user.display_name, :bbox => bbox.to_s