From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 3 Dec 2010 11:45:55 +0000 (+0000)
Subject: Dry Users API responders.
X-Git-Tag: 1.1.0~141
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ea59d93dc82d9675586c4b2e176fb4b7640e3158;p=redmine.git

Dry Users API responders.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4454 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ff118e744..fef13c7d2 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -49,8 +49,7 @@ class UsersController < ApplicationController
 
 		respond_to do |format|
 		  format.html { render :layout => !request.xhr? }
-      format.json { render :template => 'users/index.apit' }
-		  format.xml  { render :template => 'users/index.apit' }
+      format.api  { render :template => 'users/index.apit' }
 		end	
   end
   
@@ -72,8 +71,7 @@ class UsersController < ApplicationController
     
     respond_to do |format|
       format.html { render :layout => 'base' }
-      format.json { render :template => 'users/show.apit' }
-      format.xml  { render :template => 'users/show.apit' }
+      format.api  { render :template => 'users/show.apit' }
     end
   rescue ActiveRecord::RecordNotFound
     render_404
@@ -116,8 +114,7 @@ class UsersController < ApplicationController
             {:controller => 'users', :action => 'edit', :id => @user}
           )
         }
-        format.json { render :template => 'users/show.apit', :status => :created, :location => user_url(@user) }
-        format.xml  { render :template => 'users/show.apit', :status => :created, :location => user_url(@user) }
+        format.api  { render :template => 'users/show.apit', :status => :created, :location => user_url(@user) }
       end
     else
       @auth_sources = AuthSource.find(:all)
@@ -175,8 +172,7 @@ class UsersController < ApplicationController
           flash[:notice] = l(:notice_successful_update)
           redirect_to :back
         }
-        format.json { head :ok }
-        format.xml  { head :ok }
+        format.api  { head :ok }
       end
     else
       @auth_sources = AuthSource.find(:all)
diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index 096ea0cd1..b196dbd4c 100644
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -92,3 +92,13 @@ module I18n
     end
   end
 end
+
+module ActionController
+  module MimeResponds
+    class Responder
+      def api(&block)
+        any(:xml, :json, &block)
+      end
+    end
+  end
+end