diff --git a/lib/colored_enumeration/extensions/custom_field_patch.rb b/lib/colored_enumeration/extensions/custom_field_patch.rb index 8d35666..4fb5cd7 100644 --- a/lib/colored_enumeration/extensions/custom_field_patch.rb +++ b/lib/colored_enumeration/extensions/custom_field_patch.rb @@ -25,7 +25,9 @@ def self.included(base) base.include(InstanceMethods) base.class_eval do safe_attributes 'color_support' - validates :color_support, inclusion: [true, false], if: :enumeration? + validates :color_support, inclusion: [true, false], if: :with_color_support? + class_attribute :color_supporting_field_formats + self.color_supporting_field_formats = %w[enumeration] end end @@ -34,8 +36,8 @@ def color_map enumerations.pluck(:id, :color).to_h end - def enumeration? - field_format == 'enumeration' + def with_color_support? + self.class.color_supporting_field_formats.include?(field_format) end end end diff --git a/lib/colored_enumeration/extensions/query_custom_field_column_patch.rb b/lib/colored_enumeration/extensions/query_custom_field_column_patch.rb index 4a8a4e9..82035c0 100644 --- a/lib/colored_enumeration/extensions/query_custom_field_column_patch.rb +++ b/lib/colored_enumeration/extensions/query_custom_field_column_patch.rb @@ -42,7 +42,7 @@ def color_map # @overrides QueryCustomFieldColumn#css_classes # def html_attributes(issue) - return { class: css_classes } unless custom_field.enumeration? + return { class: css_classes } unless custom_field.with_color_support? return { class: css_classes } unless custom_field.color_support? val = value_object(issue) diff --git a/lib/colored_enumeration/hooks/view_custom_fields_form_upper_box_hook_listener.rb b/lib/colored_enumeration/hooks/view_custom_fields_form_upper_box_hook_listener.rb index 787f74f..0cdf16f 100644 --- a/lib/colored_enumeration/hooks/view_custom_fields_form_upper_box_hook_listener.rb +++ b/lib/colored_enumeration/hooks/view_custom_fields_form_upper_box_hook_listener.rb @@ -37,7 +37,7 @@ def view_custom_fields_form_upper_box(context = {}) custom_field = context[:custom_field] form = context[:form] - return unless custom_field.enumeration? + return unless custom_field.with_color_support? controller.send :render_to_string, { partial: 'hooks/color_support', locals: { f: form, custom_field: custom_field } }