diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bbcc2653e6..d5241ff897 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -413,5 +413,17 @@ class ApplicationController < ActionController::Base { attribute => error } end.to_json end - + + # Renders API response on validation failure + def render_validation_errors(object) + options = { :status => :unprocessable_entity, :layout => false } + options.merge!(case params[:format] + when 'xml'; { :xml => object.errors } + when 'json'; { :json => {'errors' => object.errors} } # ActiveResource client compliance + else + raise "Unknown format #{params[:format]} in #render_validation_errors" + end + ) + render options + end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index fef13c7d2e..5d80c29378 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -122,8 +122,7 @@ class UsersController < ApplicationController respond_to do |format| format.html { render :action => 'new' } - format.json { render :json => {:errors => @user.errors}, :status => :unprocessable_entity, :layout => false } - format.xml { render :xml => @user.errors, :status => :unprocessable_entity, :layout => false } + format.api { render_validation_errors(@user) } end end end @@ -180,8 +179,7 @@ class UsersController < ApplicationController respond_to do |format| format.html { render :action => :edit } - format.json { render :json => {:errors => @user.errors}, :status => :unprocessable_entity, :layout => false } - format.xml { render :xml => @user.errors, :status => :unprocessable_entity, :layout => false } + format.api { render_validation_errors(@user) } end end rescue ::ActionController::RedirectBackError