Merge tooltip fixes/tests

[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 43d5ec90883752b3212a9dfb73e32e5633b53de9..d4baf4a820a0c1dada9c5a4f13342d440f536a0f 100644 (file)
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -1,19 +1,24 @@
 module Api
   class UsersController < ApiController
-    layout "site", :except => [:api_details]
-
+    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
 
-    before_action :check_api_readable
     around_action :api_call_handle_error
     before_action :lookup_user_by_id, :only => [:show]
 
+    before_action :set_request_formats, :except => [:gpx_files]
+
     def show
       if @user.visible?
-        render :action => :show, :content_type => "text/xml"
+        # Render the result
+        respond_to do |format|
+          format.xml
+          format.json
+        end
       else
         head :gone
       end
@@ -21,7 +26,11 @@ module Api
 
     def details
       @user = current_user
-      render :action => :show, :content_type => "text/xml"
+      # Render the result
+      respond_to do |format|
+        format.xml { render :show }
+        format.json { render :show }
+      end
     end
 
     def index
@@ -33,7 +42,11 @@ module Api
 
       @users = User.visible.find(ids)
 
-      render :action => :index, :content_type => "text/xml"
+      # Render the result
+      respond_to do |format|
+        format.xml
+        format.json
+      end
     end
 
     def gpx_files