Commit 8db067c9 authored by jplang's avatar jplang

Patch ActiveRecord::Errors#full_messages so that it contains custom values error messages.

git-svn-id: https://svn.redmine.org/redmine/trunk@2518 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 3658974b
......@@ -12,6 +12,36 @@ module ActiveRecord
end
end
module ActiveRecord
class Errors
def full_messages(options = {})
full_messages = []
@errors.each_key do |attr|
@errors[attr].each do |message|
next unless message
if attr == "base"
full_messages << message
elsif attr == "custom_values"
# Replace the generic "custom values is invalid"
# with the errors on custom values
@base.custom_values.each do |value|
value.errors.each do |attr, msg|
full_messages << value.custom_field.name + ' ' + msg
end
end
else
attr_name = @base.class.human_attribute_name(attr)
full_messages << attr_name + ' ' + message
end
end
end
full_messages
end
end
end
module ActionView
module Helpers
module DateHelper
......
......@@ -63,6 +63,19 @@ class IssueTest < Test::Unit::TestCase
assert_equal 'PostgreSQL', issue.custom_value_for(field).value
end
def test_errors_full_messages_should_include_custom_fields_errors
field = IssueCustomField.find_by_name('Database')
issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 1, :status_id => 1, :subject => 'test_create', :description => 'IssueTest#test_create_with_required_custom_field')
assert issue.available_custom_fields.include?(field)
# Invalid value
issue.custom_field_values = { field.id => 'SQLServer' }
assert !issue.valid?
assert_equal 1, issue.errors.full_messages.size
assert_equal "Database #{I18n.translate('activerecord.errors.messages.inclusion')}", issue.errors.full_messages.first
end
def test_update_issue_with_required_custom_field
field = IssueCustomField.find_by_name('Database')
field.update_attribute(:is_required, true)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment