web47core 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d053924ad96678d323142bb50866aa6524667d2f1ec8d7fdec674b62bff0476e
-  data.tar.gz: eb5648235bb6b68e5d40dc387c6d3656edff6b45cef2841709cfa977a83fe31f
+  metadata.gz: c95dc1ded2406eed714fa60226d939f995826d8fdb4997e86a967f4363a0dcfd
+  data.tar.gz: fe198b4505c6a33fa455af240b59f28bcc1a38e3da9da3a9b77879dfbeeb56a3
 SHA512:
-  metadata.gz: d9262faca8080174f19ec9b67de0e3c9a1efd2edf87db623521d8cbadd421619068d0d968a8f5abe93bf15ad1e48d415b8d632f2d86fb11c16631056c92c01e8
-  data.tar.gz: '088f8e45fa0765124468b117a9652942452bbcb2499dba51d20675962a52ff18c8f7f4b0040607b5074267f7f431c401faf8c32937c85c803a057ea12c9d539f'
+  metadata.gz: 6849efd0b1fc1c5960251d23ce8777738864c1e460e3e5832b64b06c733a858e2c408eefd9d300a3b294070f839e5def87bbe94e137689a787d801eb0a1e2bc9
+  data.tar.gz: 4481ee2a4accca93a6fce56261e83aa4f3ca62787797d0b6ff2904ee5703d250bf333c7aa3c857eaa9e8537505b47022072be855f05092c588be5409e74918b7

data/app/helpers/core_form_helper.rb

@@ -122,10 +122,9 @@ module CoreFormHelper
   # Create the select tag
   #
   def form_select_tag(model, field, options = {})
-    form_name = form_field_name(model, field, options)
     select_content = {
-      id: form_name,
-      name: form_name,
+      id: form_field_id(model, field, options),
+      name: form_field_name(model, field, options),
       class: options[:input_classes],
       disabled: options[:disabled]
     }
@@ -172,13 +171,12 @@ module CoreFormHelper
   # Checkbox field
   #
   def form_checkbox(model, field, classes = %w[s12 m6 l4 xl3], options = {})
-    form_name = form_field_name model, field
     value = model.send(field)
     options[:disabled] ||= false
     properties = {
       class: 'validate',
-      id: form_name,
-      name: form_name,
+      id: form_field_id(model, field),
+      name: form_field_name(model, field),
       type: :checkbox,
       disabled: options[:disabled]
     }
@@ -245,7 +243,7 @@ module CoreFormHelper
     classes = value.nil? && place_holder.blank? ? '' : 'active'
     classes += error.present? ? ' invalid red-text' : ' valid'
     options[:class] = classes
-    options[:for] = form_field_name(model, field, options)
+    options[:for] = form_field_id(model, field, options)
     options['data-error'] = error.join(', ') if error.present?
     content_tag(:label, options) do
       concat(I18n.exists?(key) ? I18n.t(key) : field.to_s.humanize)
@@ -260,7 +258,7 @@ module CoreFormHelper
     key = "ui_form.#{model.class.to_s.underscore}.hints.#{field}"
     return nil unless I18n.exists?(key)
 
-    content_tag(:p, class: 'form-hint', for: form_field_name(model, field)) do
+    content_tag(:p, class: 'form-hint', for: form_field_id(model, field)) do
       concat(I18n.t(key))
     end
   end
@@ -269,7 +267,6 @@ module CoreFormHelper
   # Add the placeholder option if found in the translations
   #
   def text_field_options(model, field, options)
-    form_name = form_field_name model, field, options
     hint_key = "ui_form.#{model.class.to_s.underscore}.hints.#{field}"
     if I18n.exists?(hint_key)
       classes = %w[validate tooltipped]
@@ -278,8 +275,8 @@ module CoreFormHelper
       classes = %w[validate]
     end
     classes += options[:input_classes] if options[:input_classes].present?
-    options[:name] = form_name
-    options[:id] = form_name
+    options[:name] = form_field_name(model, field, options)
+    options[:id] = form_field_id(model, field, options)
     place_holder = options[:place_holder] || field_place_holder(model, field)
     if place_holder.present?
       classes << 'active'
@@ -319,6 +316,30 @@ module CoreFormHelper
     end
   end
 
+  #
+  # Return a consistent form field id
+  #
+  def form_field_id(model, field, options = {})
+    return options[:form_id] if options[:form_id].present?
+
+    # TODO: Need to handle the other side of the 1:M use case where
+    # the field name needs to end in _ids, not _id.
+    field = "#{field}_id" if model.class.reflect_on_association(field).present?
+    if options[:index].present?
+      if options[:array_name].present?
+        if options[:base_name].present?
+          "#{options[:form_id_prefix]}#{options[:base_name]}[#{options[:array_name]}[#{options[:index]}][#{field}]]"
+        else
+          "#{options[:form_id_prefix]}#{options[:array_name]}[#{options[:index]}][#{field}]"
+        end
+      else
+        "#{options[:form_id_prefix]}#{model.class.to_s.underscore}[#{options[:index]}][#{field}]"
+      end
+    else
+      "#{options[:form_id_prefix]}#{model.class.to_s.underscore}[#{field}]"
+    end
+  end
+
   def form_radio_button(model, field, options = {})
     value = model.send(field)
     classes = (%w[input-field col] + options[:classes] || []).join(' ')

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '1.1.9'
+  VERSION = '1.1.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport