From f4c7e08d0f4601bdbfade1c5c216a759daeb29d9 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Thu, 16 May 2024 08:38:04 +0000 Subject: [PATCH] Key/value-pair custom field type not available to all customizable contents (#27543). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch by Felix Schäfer (@felix) and Takenori TAKAKI (@takenory). git-svn-id: https://svn.redmine.org/redmine/trunk@22834 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/field_format.rb | 2 ++ .../lib/redmine/field_format/enumeration_format_test.rb | 4 ++++ test/unit/lib/redmine/field_format/field_format_test.rb | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb index 9ee57cca8..148cccadc 100644 --- a/lib/redmine/field_format.rb +++ b/lib/redmine/field_format.rb @@ -829,6 +829,8 @@ module Redmine end class EnumerationFormat < RecordList + self.customized_class_names = nil + add 'enumeration' self.form_partial = 'custom_fields/formats/enumeration' diff --git a/test/unit/lib/redmine/field_format/enumeration_format_test.rb b/test/unit/lib/redmine/field_format/enumeration_format_test.rb index 74a637fc4..fdae2ff6f 100644 --- a/test/unit/lib/redmine/field_format/enumeration_format_test.rb +++ b/test/unit/lib/redmine/field_format/enumeration_format_test.rb @@ -98,4 +98,8 @@ class Redmine::EnumerationFieldFormatTest < ActionView::TestCase assert_equal [@foo.id], @field.value_from_keyword('foo, baz', nil) assert_equal [], @field.value_from_keyword('baz', nil) end + + def test_customized_class_names_should_overrided_to_nil + assert_nil Redmine::FieldFormat::EnumerationFormat.customized_class_names + end end diff --git a/test/unit/lib/redmine/field_format/field_format_test.rb b/test/unit/lib/redmine/field_format/field_format_test.rb index f71d83e34..6418917f2 100644 --- a/test/unit/lib/redmine/field_format/field_format_test.rb +++ b/test/unit/lib/redmine/field_format/field_format_test.rb @@ -111,4 +111,10 @@ class Redmine::FieldFormatTest < ActionView::TestCase assert_equal "foo bar", field.format.formatted_custom_value(self, custom_value, false) assert_equal 'foo bar', field.format.formatted_custom_value(self, custom_value, true) end + + def test_as_select_should_return_enumeration_for_all_classes + %w(Issue TimeEntry Project Version Document User Group TimeEntryActivity IssuePriority DocumentCategory).each do |klass| + assert_include ['Key/value list', 'enumeration'], Redmine::FieldFormat.as_select(klass) + end + end end -- 2.39.5