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

[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 d3387bd5ffaaa1f48a0e32dff1b32d25ae3eb639..e9f42e12b1444787260dad22a18bf5ee97fdb368 100644 (file)
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -1,28 +1,14 @@
 module Api
   class UsersController < ApiController
 module Api
   class UsersController < ApiController

-    layout "site", :except => [:api_details]
-

     before_action :disable_terms_redirect, :only => [:details]
     before_action :disable_terms_redirect, :only => [:details]

+    before_action :setup_user_auth, :only => [:show, :index]

     before_action :authorize, :only => [:details, :gpx_files]
 
     authorize_resource
 
     before_action :authorize, :only => [:details, :gpx_files]
 
     authorize_resource
 

-    before_action :check_api_readable
-    around_action :api_call_handle_error
-    before_action :lookup_user_by_id, :only => [:show]
+    load_resource :only => :show

 
 

-    def show
-      if @user.visible?
-        render :content_type => "text/xml"
-      else
-        head :gone
-      end
-    end
-
-    def details
-      @user = current_user
-      render :action => :show, :content_type => "text/xml"
-    end
+    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"]
 
     def index
       raise OSM::APIBadUserInput, "The parameter users is required, and must be of the form users=id[,id[,id...]]" unless params["users"]


@@ -31,9 +17,34 @@ module Api
 
       raise OSM::APIBadUserInput, "No users were given to search for" if ids.empty?
 
 
       raise OSM::APIBadUserInput, "No users were given to search for" if ids.empty?
 

-      @users = User.visible.find(ids)
+      @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
+        respond_to do |format|
+          format.xml
+          format.json
+        end
+      else
+        head :gone
+      end
+    end

 
 

-      render :content_type => "text/xml"
+    def details
+      @user = current_user
+      # Render the result
+      respond_to do |format|
+        format.xml { render :show }
+        format.json { render :show }
+      end

     end
 
     def gpx_files
     end
 
     def gpx_files


@@ -43,14 +54,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.