Merge remote-tracking branch 'upstream/pull/4638'

[rails.git] / app / controllers / api / users_controller.rb

diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
index d4baf4a820a0c1dada9c5a4f13342d440f536a0f..6fa47095a16f9c062ba246100bea989ff7dd9ecb 100644 (file)
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -8,10 +8,26 @@ module Api
     authorize_resource
 
     around_action :api_call_handle_error
     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]
 
 
     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
     def show
       if @user.visible?
         # Render the result


@@ -33,22 +49,6 @@ module Api
       end
     end
 
       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"
     def gpx_files
       @traces = current_user.traces.reload
       render :content_type => "application/xml"


@@ -56,14 +56,6 @@ module Api
 
     private
 
 
     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.
     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.