From ba408c8718346851fb7e0a0813baf40633ba7c31 Mon Sep 17 00:00:00 2001 From: evazion Date: Fri, 3 Mar 2017 17:21:37 -0600 Subject: [PATCH] simple_form: regen config files (#2913). Regens simple form config using `rails generate simple_form:install`. Seems to fix #2913 (erroneous minlength validations being enforced as of simple_form 3.4.0). --- config/initializers/simple_form.rb | 165 ++++++++++++++++++---- config/locales/simple_form.en.yml | 21 ++- lib/templates/erb/scaffold/_form.html.erb | 18 +-- 3 files changed, 159 insertions(+), 45 deletions(-) diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb index 975b25fa3..f306c195a 100644 --- a/config/initializers/simple_form.rb +++ b/config/initializers/simple_form.rb @@ -1,45 +1,143 @@ # Use this setup block to configure all options available in SimpleForm. SimpleForm.setup do |config| + # Wrappers are used by the form builder to generate a + # complete input. You can remove any component from the + # wrapper, change the order or even add your own to the + # stack. The options given below are used to wrap the + # whole input. + config.wrappers :default, class: :input, + hint_class: :field_with_hint, error_class: :field_with_errors do |b| + ## Extensions enabled by default + # Any of these extensions can be disabled for a + # given input by passing: `f.input EXTENSION_NAME => false`. + # You can make any of these extensions optional by + # renaming `b.use` to `b.optional`. - # Components used by the form builder to generate a complete input. You can remove - # any of them, change the order, or even add your own components to the stack. - # config.components = [ :label_input, :hint, :error ] + # Determines whether to use HTML5 (:email, :url, ...) + # and required attributes + b.use :html5 - # Default tag used on hints. - # config.hint_tag = :span + # Calculates placeholders automatically from I18n + # You can also pass a string as f.input placeholder: "Placeholder" + b.use :placeholder - # Default tag used on errors. - # config.error_tag = :span + ## Optional extensions + # They are disabled unless you pass `f.input EXTENSION_NAME => true` + # to the input. If so, they will retrieve the values from the model + # if any exists. If you want to enable any of those + # extensions by default, you can change `b.optional` to `b.use`. - # Method used to tidy up errors. + # Calculates maxlength from length validations for string inputs + # and/or database column lengths + b.optional :maxlength + + # Calculate minlength from length validations for string inputs + b.optional :minlength + + # Calculates pattern from format validations for string inputs + b.optional :pattern + + # Calculates min and max from length validations for numeric inputs + b.optional :min_max + + # Calculates readonly automatically from readonly attributes + b.optional :readonly + + ## Inputs + b.use :label_input + b.use :hint, wrap_with: { tag: :span, class: :hint } + b.use :error, wrap_with: { tag: :span, class: :error } + + ## full_messages_for + # If you want to display the full error message for the attribute, you can + # use the component :full_error, like: + # + # b.use :full_error, wrap_with: { tag: :span, class: :error } + end + + # The default wrapper to be used by the FormBuilder. + config.default_wrapper = :default + + # Define the way to render check boxes / radio buttons with labels. + # Defaults to :nested for bootstrap config. + # inline: input + label + # nested: label > input + config.boolean_style = :nested + + # Default class for buttons + config.button_class = 'btn' + + # Method used to tidy up errors. Specify any Rails Array method. + # :first lists the first message for each field. + # Use :to_sentence to list all errors for each field. # config.error_method = :first # Default tag used for error notification helper. - # config.error_notification_tag = :p + config.error_notification_tag = :div - # You can wrap all inputs in a pre-defined tag. - # config.wrapper_tag = :div + # CSS class to add for error notification helper. + config.error_notification_class = 'error_notification' - # CSS class to add to all wrapper tags. - # config.wrapper_class = :input + # ID to add for error notification helper. + # config.error_notification_id = nil - # CSS class to add to the wrapper if the field has errors. - # config.wrapper_error_class = :field_with_errors + # Series of attempts to detect a default label method for collection. + # config.collection_label_methods = [ :to_label, :name, :title, :to_s ] + + # Series of attempts to detect a default value method for collection. + # config.collection_value_methods = [ :id, :to_s ] + + # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none. + # config.collection_wrapper_tag = nil + + # You can define the class to use on all collection wrappers. Defaulting to none. + # config.collection_wrapper_class = nil + + # You can wrap each item in a collection of radio/check boxes with a tag, + # defaulting to :span. + # config.item_wrapper_tag = :span + + # You can define a class to use in all item wrappers. Defaulting to none. + # config.item_wrapper_class = nil # How the label text should be generated altogether with the required text. - # config.label_text = lambda { |label, required| "#{required} #{label}" } + # config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" } + + # You can define the class to use on all labels. Default is nil. + # config.label_class = nil + + # You can define the default class to be used on forms. Can be overriden + # with `html: { :class }`. Defaulting to none. + # config.default_form_class = nil + + # You can define which elements should obtain additional classes + # config.generate_additional_classes_for = [:wrapper, :label, :input] # Whether attributes are required by default (or not). Default is true. # config.required_by_default = true - # Series of attemps to detect a default label method for collection. - # config.collection_label_methods = [ :to_label, :name, :title, :to_s ] - - # Series of attemps to detect a default value method for collection. - # config.collection_value_methods = [ :id, :to_s ] + # Tell browsers whether to use the native HTML5 validations (novalidate form option). + # These validations are enabled in SimpleForm's internal config but disabled by default + # in this configuration, which is recommended due to some quirks from different browsers. + # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations, + # change this configuration to true. + config.browser_validations = false # Collection of methods to detect if a file type was given. - # config.file_methods = [ :file?, :public_filename ] + # config.file_methods = [ :mounted_as, :file?, :public_filename ] + + # Custom mappings for input types. This should be a hash containing a regexp + # to match as key, and the input type that will be used when the field name + # matches the regexp as value. + # config.input_mappings = { /count/ => :integer } + + # Custom wrappers for input types. This should be a hash containing an input + # type as key and the wrapper that will be used for all inputs with specified type. + # config.wrapper_mappings = { string: :prepend } + + # Namespaces where SimpleForm should look for custom input classes that + # override default inputs. + # config.custom_inputs_namespaces << "CustomInputs" # Default priority for time_zone inputs. # config.time_zone_priority = nil @@ -47,6 +145,25 @@ SimpleForm.setup do |config| # Default priority for country inputs. # config.country_priority = nil - # Default size for text inputs. - # config.default_input_size = 30 + # When false, do not use translations for labels. + # config.translate_labels = true + + # Automatically discover new inputs in Rails' autoload path. + # config.inputs_discovery = true + + # Cache SimpleForm inputs discovery + # config.cache_discovery = !Rails.env.development? + + # Default class for inputs + # config.input_class = nil + + # Define the default class of the input wrapper of the boolean input. + config.boolean_label_class = 'checkbox' + + # Defines if the default input wrapper class should be included in radio + # collection wrappers. + # config.include_default_input_wrapper_class = true + + # Defines which i18n scope will be used in Simple Form. + # config.i18n_scope = 'simple_form' end diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 409e2651d..237438334 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -9,16 +9,23 @@ en: # When using html, text and mark won't be used. # html: '*' error_notification: - default_message: "Some errors were found, please take a look:" - # Labels and hints examples + default_message: "Please review the problems below:" + # Examples # labels: - # password: 'Password' + # defaults: + # password: 'Password' # user: # new: - # email: 'E-mail para efetuar o sign in.' + # email: 'E-mail to sign in.' # edit: # email: 'E-mail.' # hints: - # username: 'User name to sign in.' - # password: 'No special characters, please.' - + # defaults: + # username: 'User name to sign in.' + # password: 'No special characters, please.' + # include_blanks: + # defaults: + # age: 'Rather not say' + # prompts: + # defaults: + # age: 'Select your age' diff --git a/lib/templates/erb/scaffold/_form.html.erb b/lib/templates/erb/scaffold/_form.html.erb index 62de5dff8..201a069e2 100644 --- a/lib/templates/erb/scaffold/_form.html.erb +++ b/lib/templates/erb/scaffold/_form.html.erb @@ -1,23 +1,13 @@ -<%%= simple_form_for(@<%= singular_name %>) do |f| %> - <%% if @<%= singular_name %>.errors.any? %> -
-

<%%= pluralize(@<%= singular_name %>.errors.count, "error") %> prohibited this <%= singular_name %> from being saved:

+<%%= simple_form_for(@<%= singular_table_name %>) do |f| %> + <%%= f.error_notification %> - -
- <%% end %> - -
+
<%- attributes.each do |attribute| -%> <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %> <%- end -%>
-
+
<%%= f.button :submit %>
<%% end %>