X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7297bdb72cc23768e71e38dbf31a1ea46c91e318..c848a88240a627711635627d03fbd4ef90955c93:/app/controllers/api/users_controller.rb diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb index 888753fe9..e9f42e12b 100644 --- a/app/controllers/api/users_controller.rb +++ b/app/controllers/api/users_controller.rb @@ -1,14 +1,12 @@ module Api class UsersController < ApiController - before_action :check_api_readable before_action :disable_terms_redirect, :only => [:details] before_action :setup_user_auth, :only => [:show, :index] before_action :authorize, :only => [:details, :gpx_files] authorize_resource - around_action :api_call_handle_error - before_action :lookup_user_by_id, :only => [:show] + load_resource :only => :show before_action :set_request_formats, :except => [:gpx_files] @@ -19,7 +17,7 @@ module Api raise OSM::APIBadUserInput, "No users were given to search for" if ids.empty? - @users = User.visible.where(:id => ids).order(:id) + @users = User.visible.where(:id => ids).in_order_of(:id, ids) # Render the result respond_to do |format| @@ -56,14 +54,6 @@ module Api private - ## - # ensure that there is a "user" instance variable - def lookup_user_by_id - @user = User.find(params[:id]) - end - - ## - # def disable_terms_redirect # this is necessary otherwise going to the user terms page, when # having not agreed already would cause an infinite redirect loop.