mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
ead4776b82
### Summary The [`:field_error_proc`](https://github.com/rails/rails/blob/master/actionview/lib/action_view/base.rb#L145) is responsible for decorating input tags that refer to attributes with errors. This default build-in rails feature wrap invalid form elements with additional markup: `<div class="field_with_errors">[…]</div>`. * Fix for `field_error_proc` wraps form select `optgroup` * Fix for `field_error_proc` wraps form select divider `option` * Add tests for uncovered elements with errors [Fixes #31088] #### Test coverage * `test_select_grouped_options_with_errors` * `test_time_zone_select_with_priority_zones_and_errors` #### Extend test coverage * `test_collection_select_with_errors` * `test_label_with_errors` * `test_check_box_with_errors` * `test_check_boxes_with_errors` * `test_radio_button_with_errors` * `test_radio_buttons_with_errors` * `test_collection_check_boxes_with_errors` * `test_collection_radio_buttons_with_errors`
55 lines
1.3 KiB
Ruby
55 lines
1.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "active_support/core_ext/module/attribute_accessors"
|
|
require "active_support/core_ext/enumerable"
|
|
|
|
module ActionView
|
|
# = Active Model Helpers
|
|
module Helpers #:nodoc:
|
|
module ActiveModelHelper
|
|
end
|
|
|
|
module ActiveModelInstanceTag
|
|
def object
|
|
@active_model_object ||= begin
|
|
object = super
|
|
object.respond_to?(:to_model) ? object.to_model : object
|
|
end
|
|
end
|
|
|
|
def content_tag(type, options, *)
|
|
select_markup_helper?(type) ? super : error_wrapping(super)
|
|
end
|
|
|
|
def tag(type, options, *)
|
|
tag_generate_errors?(options) ? error_wrapping(super) : super
|
|
end
|
|
|
|
def error_wrapping(html_tag)
|
|
if object_has_errors?
|
|
Base.field_error_proc.call(html_tag, self)
|
|
else
|
|
html_tag
|
|
end
|
|
end
|
|
|
|
def error_message
|
|
object.errors[@method_name]
|
|
end
|
|
|
|
private
|
|
|
|
def object_has_errors?
|
|
object.respond_to?(:errors) && object.errors.respond_to?(:[]) && error_message.present?
|
|
end
|
|
|
|
def select_markup_helper?(type)
|
|
["optgroup", "option"].include?(type)
|
|
end
|
|
|
|
def tag_generate_errors?(options)
|
|
options["type"] != "hidden"
|
|
end
|
|
end
|
|
end
|
|
end
|