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 ff118e74443b78ec4d6e7f6f6e138485296275a3..fef13c7d2ee79fb7c165fd2a81600bcd2e9299f4 100644 (file)
--- 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 096ea0cd168644b116479d4f4232e5a1ddf097ac..b196dbd4c9082426601b2084a6dcf9986e6a3a5f 100644 (file)
--- 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