Commit 65d8a724 authored by jplang's avatar jplang
Browse files

Accept custom field format added at runtime (#15277).

Patch by Boris Bera.

git-svn-id: https://svn.redmine.org/redmine/trunk@12248 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent a1e3d0de
......@@ -26,7 +26,7 @@ class CustomField < ActiveRecord::Base
validates_presence_of :name, :field_format
validates_uniqueness_of :name, :scope => :type
validates_length_of :name, :maximum => 30
validates_inclusion_of :field_format, :in => Redmine::CustomFieldFormat.available_formats
validates_inclusion_of :field_format, :in => Proc.new { Redmine::CustomFieldFormat.available_formats }
validate :validate_custom_field
before_validation :set_searchable
......
......@@ -70,6 +70,13 @@ module Redmine
@@available[custom_field_format.name] = custom_field_format unless @@available.keys.include?(custom_field_format.name)
end
def delete(format)
if format.is_a?(Redmine::CustomFieldFormat)
format = format.name
end
@@available.delete(format)
end
def available_formats
@@available.keys
end
......
......@@ -57,6 +57,20 @@ class CustomFieldTest < ActiveSupport::TestCase
assert field.valid?
end
def test_field_format_should_be_validated
field = CustomField.new(:name => 'Test', :field_format => 'foo')
assert !field.valid?
end
def test_field_format_validation_should_accept_formats_added_at_runtime
Redmine::CustomFieldFormat.register 'foobar'
field = CustomField.new(:name => 'Some Custom Field', :field_format => 'foobar')
assert field.valid?, 'field should be valid'
ensure
Redmine::CustomFieldFormat.delete 'foobar'
end
def test_should_not_change_field_format_of_existing_custom_field
field = CustomField.find(1)
field.field_format = 'int'
......
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