summaryrefslogtreecommitdiffstats
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-03-04 15:16:50 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-03-04 15:16:50 +0000
commitdc50edae5e27fdfc72a7de4d9b7021d98d9621bc (patch)
treeda31e2c09e7beff18eeeec822811630018508d5b /app/controllers/application_controller.rb
parent5803bf9fc4545610a7ee46ce7f6a6bf9b4f55a57 (diff)
downloadredmine-dc50edae5e27fdfc72a7de4d9b7021d98d9621bc.tar.gz
redmine-dc50edae5e27fdfc72a7de4d9b7021d98d9621bc.zip
Adds a template for API error messages so that it does not depend on AR::Errors serialization.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9094 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb11
1 files changed, 2 insertions, 9 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d6cf2c979..24b45f6ac 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -508,15 +508,8 @@ class ApplicationController < ActionController::Base
# 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
+ @error_messages = object.errors.full_messages
+ render :template => 'common/error_messages.api', :status => :unprocessable_entity, :layout => false
end
# Overrides #default_template so that the api template