kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dry Users API responders. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4454 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-12-03 11:45:55 +00:00
parent e9775097ec
commit ea59d93dc8
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/users_controller.rb
View File

@ -49,8 +49,7 @@ class UsersController < ApplicationController
respond_to do |format| respond_to do |format|
format.html { render :layout => !request.xhr? } format.html { render :layout => !request.xhr? }
format.json { render :template => 'users/index.apit' } format.api { render :template => 'users/index.apit' }
format.xml { render :template => 'users/index.apit' }
end end
end end
@ -72,8 +71,7 @@ class UsersController < ApplicationController
respond_to do |format| respond_to do |format|
format.html { render :layout => 'base' } format.html { render :layout => 'base' }
format.json { render :template => 'users/show.apit' } format.api { render :template => 'users/show.apit' }
format.xml { render :template => 'users/show.apit' }
end end
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
render_404 render_404
@ -116,8 +114,7 @@ class UsersController < ApplicationController
{:controller => 'users', :action => 'edit', :id => @user} {:controller => 'users', :action => 'edit', :id => @user}
) )
} }
format.json { render :template => 'users/show.apit', :status => :created, :location => user_url(@user) } format.api { render :template => 'users/show.apit', :status => :created, :location => user_url(@user) }
format.xml { render :template => 'users/show.apit', :status => :created, :location => user_url(@user) }
end end
else else
@auth_sources = AuthSource.find(:all) @auth_sources = AuthSource.find(:all)
@ -175,8 +172,7 @@ class UsersController < ApplicationController
flash[:notice] = l(:notice_successful_update) flash[:notice] = l(:notice_successful_update)
redirect_to :back redirect_to :back
} }
format.json { head :ok } format.api { head :ok }
format.xml { head :ok }
end end
else else
@auth_sources = AuthSource.find(:all) @auth_sources = AuthSource.find(:all)

10
config/initializers/10-patches.rb
View File

@ -92,3 +92,13 @@ module I18n
end end
end end
end end
module ActionController
module MimeResponds
class Responder
def api(&block)
any(:xml, :json, &block)
end
end
end
end