X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7f619c6484ae92d6ea12f1c3a9f67c3d421ae06a..c8fc2218e5e342ad7afc9409974fd48a733ba94b:/app/controllers/api/users_controller.rb?ds=sidebyside diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb index d4baf4a82..ab48a5189 100644 --- a/app/controllers/api/users_controller.rb +++ b/app/controllers/api/users_controller.rb @@ -12,6 +12,22 @@ module Api before_action :set_request_formats, :except => [:gpx_files] + def index + raise OSM::APIBadUserInput, "The parameter users is required, and must be of the form users=id[,id[,id...]]" unless params["users"] + + ids = params["users"].split(",").collect(&:to_i) + + raise OSM::APIBadUserInput, "No users were given to search for" if ids.empty? + + @users = User.visible.where(:id => ids).in_order_of(:id, ids) + + # Render the result + respond_to do |format| + format.xml + format.json + end + end + def show if @user.visible? # Render the result @@ -33,22 +49,6 @@ module Api end end - def index - raise OSM::APIBadUserInput, "The parameter users is required, and must be of the form users=id[,id[,id...]]" unless params["users"] - - ids = params["users"].split(",").collect(&:to_i) - - raise OSM::APIBadUserInput, "No users were given to search for" if ids.empty? - - @users = User.visible.find(ids) - - # Render the result - respond_to do |format| - format.xml - format.json - end - end - def gpx_files @traces = current_user.traces.reload render :content_type => "application/xml"