active_scaffold 3.6.20 → 3.7.1

data/lib/active_scaffold/attribute_params.rb

@@ -33,41 +33,10 @@ module ActiveScaffold
   module AttributeParams
     protected
 
-    # workaround to update counters when polymorphic has_many changes on persisted record
-    # TODO: remove when rails4 support is removed or counter cache for polymorphic has_many association works on rails4
-    def hack_for_has_many_counter_cache(parent_record, column, value)
-      association = parent_record.association(column.name)
-      counter_attr = association.send(:cached_counter_attribute_name)
-      difference = value.select(&:persisted?).size - parent_record.send(counter_attr)
-
-      if parent_record.new_record?
-        parent_record.send "#{column.name}=", value
-        parent_record.send "#{counter_attr}_will_change!"
-      else
-        # don't decrement counter for deleted records, on destroy they will update counter
-        difference += (parent_record.send(column.name) - value).size
-        association.send :update_counter, difference unless difference.zero?
-      end
-
-      # update counters on old parents if belongs_to is changed
-      value.select(&:persisted?).each do |record|
-        key = record.send(column.association.foreign_key)
-        parent_record.class.decrement_counter counter_attr, key if key && key != parent_record.id # rubocop:disable Rails/SkipsModelValidations
-      end
-      parent_record.send "#{column.name}=", value if parent_record.persisted?
-    end
-
-    # rails 4 needs this hack for polymorphic has_many
-    # TODO: remove when hack_for_has_many_counter_cache is not needed
-    def hack_for_has_many_counter_cache?(parent_record, column)
-      column.association.counter_cache_hack? && parent_record.association(column.name).send(:has_cached_counter?)
-    end
-
     # workaround for updating counters twice bug on rails4 (https://github.com/rails/rails/pull/14849)
-    # rails 4 needs this hack for non-polymorphic belongs_to, when selecting record, not creating new one (value is Hash)
     # rails 5 needs this hack for belongs_to, when selecting record, not creating new one (value is Hash)
-    # TODO: remove when pull request is merged and no version with bug is supported
-    def counter_cache_hack?(association, value)
+    # TODO: remove when rails5 support is removed
+    def belongs_to_counter_cache_hack?(association, value)
       !params_hash?(value) && association.belongs_to? && association.counter_cache_hack?
     end
 
@@ -92,21 +61,19 @@ module ActiveScaffold
       multi_parameter_attrs = multi_parameter_attributes(attributes)
 
       columns.each_column(for: parent_record, crud_type: crud_type, flatten: true) do |column|
-        begin
-          # Set any passthrough parameters that may be associated with this column (ie, file column "keep" and "temp" attributes)
-          column.params.select { |p| attributes.key? p }.each { |p| parent_record.send("#{p}=", attributes[p]) }
+        # Set any passthrough parameters that may be associated with this column (ie, file column "keep" and "temp" attributes)
+        column.params.select { |p| attributes.key? p }.each { |p| parent_record.send("#{p}=", attributes[p]) }
 
-          if multi_parameter_attrs.key? column.name.to_s
-            parent_record.send(:assign_multiparameter_attributes, multi_parameter_attrs[column.name.to_s])
-          elsif attributes.key? column.name
-            update_column_from_params(parent_record, column, attributes[column.name], avoid_changes)
-          end
-        rescue StandardError => e
-          message = "on the ActiveScaffold column = :#{column.name} for #{parent_record.inspect} "\
-                    "(value from params #{attributes[column.name].inspect})"
-          Rails.logger.error "#{e.class.name}: #{e.message} -- #{message}"
-          raise
+        if multi_parameter_attrs.key? column.name.to_s
+          parent_record.send(:assign_multiparameter_attributes, multi_parameter_attrs[column.name.to_s])
+        elsif attributes.key? column.name
+          update_column_from_params(parent_record, column, attributes[column.name], avoid_changes)
         end
+      rescue StandardError => e
+        message = "on the ActiveScaffold column = :#{column.name} for #{parent_record.inspect} "\
+                  "(value from params #{attributes[column.name].inspect})"
+        Rails.logger.error "#{e.class.name}: #{e.message} -- #{message}"
+        raise
       end
 
       parent_record
@@ -132,7 +99,7 @@ module ActiveScaffold
     end
 
     def update_column_association(parent_record, column, attribute, value)
-      if counter_cache_hack?(column.association, attribute)
+      if belongs_to_counter_cache_hack?(column.association, attribute)
         parent_record.send "#{column.association.foreign_key}=", value&.id
         parent_record.association(column.name).target = value
       elsif column.association.collection? && column.association.through_singular?
@@ -140,8 +107,6 @@ module ActiveScaffold
         through_record = parent_record.send(through)
         through_record ||= parent_record.send "build_#{through}"
         through_record.send "#{column.association.source_reflection.name}=", value
-      elsif hack_for_has_many_counter_cache?(parent_record, column)
-        hack_for_has_many_counter_cache(parent_record, column, value)
       else
         parent_record.send "#{column.name}=", value
       end
@@ -164,7 +129,7 @@ module ActiveScaffold
 
     def datetime_conversion_for_value(column)
       if column.column
-        column.column.type == :date ? :to_date : :to_time
+        column.column_type == :date ? :to_date : :to_time
       else
         :to_time
       end
@@ -184,7 +149,11 @@ module ActiveScaffold
 
     def association_value_from_param_simple_value(parent_record, column, value)
       if column.association.singular?
-        column.association.klass(parent_record)&.find(value) if value.present?
+        # value may be Array if using update_columns in field_search with multi-select
+        klass = column.association.klass(parent_record)
+        # find_by needed when using update_columns in type foreign type key of polymorphic association,
+        # and foreign key had value, it will try to find record with id of previous type
+        klass&.find_by(klass&.primary_key => value) if value.present? && !value.is_a?(Array)
       else # column.association.collection?
         column_plural_assocation_value_from_value(column, Array(value))
       end
@@ -315,26 +284,9 @@ module ActiveScaffold
     end
 
     def default_value?(column_name, klass, value)
-      column = ActiveScaffold::OrmChecks.columns_hash(klass)[column_name]
-      default_value = column_default_value(column_name, klass)
-      casted_value = ActiveScaffold::Core.column_type_cast(value, column)
+      casted_value = ActiveScaffold::OrmChecks.cast(klass, column_name, value)
+      default_value = ActiveScaffold::OrmChecks.default_value(klass, column_name)
       casted_value == default_value
     end
-
-    def column_default_value(column_name, klass)
-      column = ActiveScaffold::OrmChecks.columns_hash(klass)[column_name]
-      return unless column
-      if ActiveScaffold::OrmChecks.mongoid? klass
-        column.default_val
-      elsif ActiveScaffold::OrmChecks.active_record? klass
-        if Rails.version < '5.0'
-          column.type_cast_from_database(column.default)
-        else
-          column_type = ActiveScaffold::OrmChecks.column_type(klass, column_name)
-          cast_type = ActiveRecord::Type.lookup column_type
-          cast_type ? cast_type.deserialize(column.default) : column.default
-        end
-      end
-    end
   end
 end

data/lib/active_scaffold/bridges/active_storage/active_storage_helpers.rb

@@ -2,9 +2,6 @@ module ActiveScaffold
   module Bridges
     class ActiveStorage
       module ActiveStorageBridgeHelpers
-        mattr_accessor :thumbnail_variant
-        self.thumbnail_variant = {resize_to_limit: [nil, 30]}
-
         class << self
           # has_one :"#{name}_attachment", -> { where(name: name) }, class_name: "ActiveStorage::Attachment", as: :record, inverse_of: :record, dependent: false
           def active_storage_has_one_fields(klass)

data/lib/active_scaffold/bridges/active_storage/form_ui.rb

@@ -2,20 +2,20 @@ module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a Form Column
     module FormColumnHelpers
-      def active_scaffold_input_active_storage_has_one(column, options)
+      def active_scaffold_input_active_storage_has_one(column, options, ui_options: column.options)
         record = options[:object]
         active_storage = record.send(column.name.to_s)
-        content = active_scaffold_column_active_storage_has_one(record, column) if active_storage.attached?
-        active_scaffold_file_with_remove_link(column, options, content, 'delete_', 'active_storage_controls')
+        content = active_scaffold_column_active_storage_has_one(record, column, ui_options: ui_options) if active_storage.attached?
+        active_scaffold_file_with_remove_link(column, options, content, 'delete_', 'active_storage_controls', ui_options: ui_options)
       end
 
-      def active_scaffold_input_active_storage_has_many(column, options)
+      def active_scaffold_input_active_storage_has_many(column, options, ui_options: column.options)
         record = options[:object]
         options[:multiple] = 'multiple'
         options[:name] += '[]'
         active_storage = record.send(column.name.to_s)
-        content = active_scaffold_column_active_storage_has_many(record, column) if active_storage.attached?
-        active_scaffold_file_with_remove_link(column, options, content, 'delete_', 'active_storage_controls')
+        content = active_scaffold_column_active_storage_has_many(record, column, ui_options: ui_options) if active_storage.attached?
+        active_scaffold_file_with_remove_link(column, options, content, 'delete_', 'active_storage_controls', ui_options: ui_options)
       end
     end
   end

data/lib/active_scaffold/bridges/active_storage/list_ui.rb

@@ -1,18 +1,18 @@
 module ActiveScaffold
   module Helpers
     module ListColumnHelpers
-      def active_scaffold_column_active_storage_has_one(record, column)
+      def active_scaffold_column_active_storage_has_one(record, column, ui_options: column.options)
         attachment = record.send(column.name.to_s)
-        attachment.attached? ? link_for_attachment(attachment, column) : nil
+        attachment.attached? ? link_for_attachment(attachment, column, ui_options: ui_options) : nil
       end
 
-      def active_scaffold_column_active_storage_has_many(record, column)
+      def active_scaffold_column_active_storage_has_many(record, column, ui_options: column.options)
         active_storage_files = record.send(column.name.to_s)
         return nil unless active_storage_files.attached?
 
         attachments = active_storage_files.attachments
         if attachments.size <= 3 # Lets display up to three links, otherwise just show the count.
-          links = attachments.map { |attachment| link_for_attachment(attachment, column) }
+          links = attachments.map { |attachment| link_for_attachment(attachment, column, ui_options: ui_options) }
           safe_join links, association_join_text(column)
         else
           pluralize attachments.size, column.name.to_s
@@ -21,10 +21,10 @@ module ActiveScaffold
 
       private
 
-      def link_for_attachment(attachment, column)
-        variant = column.options[:thumb] || ActiveScaffold::Bridges::ActiveStorage::ActiveStorageBridgeHelpers.thumbnail_variant
+      def link_for_attachment(attachment, column, ui_options: column.options)
+        variant = ui_options[:thumb] || ActiveScaffold::Bridges::ActiveStorage.thumbnail_variant
         content =
-          if variant && attachment.variable? && column.options[:thumb] != false
+          if variant && attachment.variable? && ui_options[:thumb] != false
             image_tag(attachment.variant(variant))
           else
             attachment.filename

data/lib/active_scaffold/bridges/active_storage.rb

@@ -1,4 +1,7 @@
 class ActiveScaffold::Bridges::ActiveStorage < ActiveScaffold::DataStructures::Bridge
+  cattr_accessor :thumbnail_variant
+  self.thumbnail_variant = {resize_to_limit: [nil, 30]}
+
   def self.install
     Dir[File.join(__dir__, 'active_storage', '*.rb')].each { |file| require file }
     ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::ActiveStorage::ActiveStorageBridge

data/lib/active_scaffold/bridges/ancestry/ancestry_bridge.rb

@@ -15,12 +15,12 @@ module ActiveScaffold::Bridges
     end
 
     module FormColumnHelpers
-      def active_scaffold_input_ancestry(column, options)
+      def active_scaffold_input_ancestry(column, options, ui_options: column.options)
         record = options[:object]
         select_options = []
         select_control_options = {:selected => record.parent_id}
         select_control_options[:include_blank] = as_(:_select_) if record.parent_id.nil?
-        method = column.options[:label_method] || :to_label
+        method = ui_options[:label_method] || :to_label
         traverse_ancestry = proc do |key, value|
           unless key == record
             select_options << ["#{'__' * key.depth}#{key.send(method)}", key.id]

data/lib/active_scaffold/bridges/bitfields/bitfields_bridge.rb

@@ -8,9 +8,9 @@ module ActiveScaffold
 
           model.bitfields.each_value do |options|
             columns << options.keys
-            options.each do |column, value|
+            options.each_key.with_index(1) do |column, i|
               columns[column].form_ui = :checkbox
-              columns[column].weight = 1000 + value.to_s(2).size
+              columns[column].weight = 1000 + i
             end
           end
         end

data/lib/active_scaffold/bridges/calendar_date_select/as_cds_bridge.rb

@@ -16,19 +16,20 @@ module ActiveScaffold
 
       # Helpers that assist with the rendering of a Form Column
       module FormColumnHelpers
-        def active_scaffold_input_calendar_date_select(column, options)
+        def active_scaffold_input_calendar_date_select(column, options, ui_options: column.options)
           options[:class] = "#{options[:class]} text-input".strip
-          calendar_date_select('record', column.name, options.merge(column.options))
+          calendar_date_select('record', column.name, options.merge(ui_options))
         end
       end
 
       module SearchColumnHelpers
-        def active_scaffold_search_date_bridge_calendar_control(column, options, current_search, name)
-          value = if current_search.is_a? Hash
-                    controller.class.condition_value_for_datetime(column, current_search[name], column.column.type == :date ? :to_date : :to_time)
-                  else
-                    current_search
-                  end
+        def active_scaffold_search_calendar_date_select_field(column, options, current_search, name, ui_options: column.options)
+          value =
+            if current_search.is_a? Hash
+              controller.class.condition_value_for_datetime(column, current_search[name], column.column_type == :date ? :to_date : :to_time)
+            else
+              current_search
+            end
           calendar_date_select(
             'record', column.name,
             :name => "#{options[:name]}[#{name}]",
@@ -46,15 +47,12 @@ end
 
 ActionView::Base.class_eval do
   include ActiveScaffold::Bridges::CalendarDateSelect::FormColumnHelpers
-  include ActiveScaffold::Bridges::Shared::DateBridge::SearchColumnHelpers
-  alias_method :active_scaffold_search_calendar_date_select, :active_scaffold_search_date_bridge
-  include ActiveScaffold::Bridges::Shared::DateBridge::HumanConditionHelpers
-  alias_method :active_scaffold_human_condition_calendar_date_select, :active_scaffold_human_condition_date_bridge
+  alias_method :active_scaffold_search_calendar_date_select, :active_scaffold_search_datetime
+  alias_method :active_scaffold_human_condition_calendar_date_select, :active_scaffold_human_condition_datetime
   include ActiveScaffold::Bridges::CalendarDateSelect::SearchColumnHelpers
 end
 
 ActiveScaffold::Finder::ClassMethods.module_eval do
-  include ActiveScaffold::Bridges::Shared::DateBridge::Finder::ClassMethods
-  alias_method :condition_for_calendar_date_select_type, :condition_for_date_bridge_type
+  alias_method :condition_for_calendar_date_select_type, :condition_for_datetime
 end
 ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::CalendarDateSelect::CalendarDateSelectBridge

data/lib/active_scaffold/bridges/carrierwave/form_ui.rb

@@ -1,11 +1,11 @@
 module ActiveScaffold
   module Helpers
     module FormColumnHelpers
-      def active_scaffold_input_carrierwave(column, options)
+      def active_scaffold_input_carrierwave(column, options, ui_options: column.options)
         record = options[:object]
         carrierwave = record.send(column.name.to_s)
         content = get_column_value(record, column) if carrierwave.file.present?
-        active_scaffold_file_with_remove_link(column, options, content, 'remove_', 'carrierwave_controls') do
+        active_scaffold_file_with_remove_link(column, options, content, 'remove_', 'carrierwave_controls', ui_options: ui_options) do
           cache_field_options = {
             name: options[:name].gsub(/\[#{column.name}\]$/, "[#{column.name}_cache]"),
             id: options[:id] + '_cache'

data/lib/active_scaffold/bridges/carrierwave/list_ui.rb

@@ -1,7 +1,7 @@
 module ActiveScaffold
   module Helpers
     module ListColumnHelpers
-      def active_scaffold_column_carrierwave(record, column)
+      def active_scaffold_column_carrierwave(record, column, ui_options: column.options)
         carrierwave = record.send(column.name.to_s)
         return nil if carrierwave.file.blank?
         thumbnail_style = ActiveScaffold::Bridges::Carrierwave::CarrierwaveBridgeHelpers.thumbnail_style

data/lib/active_scaffold/bridges/chosen/helpers.rb

@@ -10,39 +10,39 @@ class ActiveScaffold::Bridges::Chosen
 
     module FormColumnHelpers
       # requires RecordSelect plugin to be installed and configured.
-      def active_scaffold_input_chosen(column, html_options)
+      def active_scaffold_input_chosen(column, html_options, ui_options: column.options)
         html_options[:class] << ' chosen'
         if column.association&.collection?
           record = html_options.delete(:object)
           associated_options, select_options = active_scaffold_plural_association_options(column, record)
           options = {selected: associated_options.collect(&:id), include_blank: as_(:_select_), object: record}
 
-          html_options.update(multiple: true).update(column.options[:html_options] || {})
-          options.update(column.options)
+          html_options.update(multiple: true).update(ui_options[:html_options] || {})
+          options.update(ui_options)
           active_scaffold_select_name_with_multiple html_options
 
           if (optgroup = options.delete(:optgroup))
             select(:record, column.name, active_scaffold_grouped_options(column, select_options, optgroup), options, html_options)
           else
-            collection_select(:record, column.name, select_options, :id, column.options[:label_method] || :to_label, options, html_options)
+            collection_select(:record, column.name, select_options, :id, ui_options[:label_method] || :to_label, options, html_options)
           end
         else
-          active_scaffold_input_select(column, html_options)
+          active_scaffold_input_select(column, html_options, ui_options: ui_options)
         end
       end
     end
 
     module SearchColumnHelpers
-      def active_scaffold_search_chosen(column, options)
+      def active_scaffold_search_chosen(column, options, ui_options: column.options)
         options[:class] << ' chosen'
-        active_scaffold_search_select(column, options)
+        active_scaffold_search_select(column, options, ui_options: ui_options)
       end
 
-      def active_scaffold_search_multi_chosen(column, options)
+      def active_scaffold_search_multi_chosen(column, options, ui_options: column.options)
         options[:class] << ' chosen'
         options[:multiple] = true
-        options[:'data-placeholder'] = column.options[:placeholder] || as_(:_select_)
-        active_scaffold_search_select(column, options)
+        options[:'data-placeholder'] = ui_options[:placeholder] || as_(:_select_)
+        active_scaffold_search_select(column, options, ui_options: ui_options)
       end
     end
   end

data/lib/active_scaffold/bridges/country_select/country_select_bridge_helper.rb

@@ -1,18 +1,18 @@
 module ActiveScaffold::Bridges
   class CountrySelect
     module FormColumnHelpers
-      def active_scaffold_input_country(column, options)
-        select_options = {:prompt => as_(:_select_), :priority_countries => column.options[:priority] || [:us]}
-        select_options[:format] = column.options[:format] if column.options[:format]
+      def active_scaffold_input_country(column, options, ui_options: column.options)
+        select_options = {:prompt => as_(:_select_), :priority_countries => ui_options[:priority] || [:us]}
+        select_options[:format] = ui_options[:format] if ui_options[:format]
         select_options.merge!(options)
-        options.reverse_merge!(column.options).except!(:prompt, :priority, :format)
+        options.reverse_merge!(ui_options).except!(:prompt, :priority, :format)
         active_scaffold_select_name_with_multiple options
         country_select(:record, column.name, select_options, options.except(:object))
       end
     end
 
     module ListColumnHelpers
-      def active_scaffold_column_country(record, column)
+      def active_scaffold_column_country(record, column, ui_options: column.options)
         country_code = record.send(column.name)
         return if country_code.blank?
         country = ISO3166::Country[country_code]
@@ -22,8 +22,8 @@ module ActiveScaffold::Bridges
     end
 
     module SearchColumnHelpers
-      def active_scaffold_search_country(column, options)
-        active_scaffold_input_country(column, options.merge!(:selected => options.delete(:value)))
+      def active_scaffold_search_country(column, options, ui_options: column.options)
+        active_scaffold_input_country(column, options.merge!(:selected => options.delete(:value)), ui_options: ui_options)
       end
     end
   end

data/lib/active_scaffold/bridges/date_picker/ext.rb

@@ -10,6 +10,7 @@ class ActiveScaffold::Bridges::DatePicker
   module DatePickerBridge
     def initialize(model_id)
       super
+      return unless ActiveScaffold::Bridges::DatePicker.default_ui
 
       date_picker_fields = _columns.collect { |c| {:name => c.name.to_sym, :type => c.type} if %i[date datetime].include?(c.type) }.compact
       # check to see if file column was used on the model
@@ -31,6 +32,18 @@ class ActiveScaffold::Bridges::DatePicker
         super
       end
     end
+
+    def datetime_column_date?(column)
+      if %i[date_picker datetime_picker].include? column.search_ui
+        column.search_ui == :date_picker
+      else
+        super
+      end
+    end
+
+    def format_for_date(column, value, format_name = column.options[:format])
+      super column, value, format_name || (:default if column.search_ui == :date_picker)
+    end
   end
 
   module AttributeParams
@@ -46,22 +59,20 @@ end
 
 ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::DatePicker::DatePickerBridge
 ActionView::Base.class_eval do
-  include ActiveScaffold::Bridges::Shared::DateBridge::SearchColumnHelpers
-  alias_method :active_scaffold_search_date_picker, :active_scaffold_search_date_bridge
-  alias_method :active_scaffold_search_datetime_picker, :active_scaffold_search_date_bridge
-  include ActiveScaffold::Bridges::Shared::DateBridge::HumanConditionHelpers
-  alias_method :active_scaffold_human_condition_date_picker, :active_scaffold_human_condition_date_bridge
-  alias_method :active_scaffold_human_condition_datetime_picker, :active_scaffold_human_condition_date_bridge
+  alias_method :active_scaffold_search_date_picker, :active_scaffold_search_datetime
+  alias_method :active_scaffold_search_datetime_picker, :active_scaffold_search_datetime
+  alias_method :active_scaffold_human_condition_date_picker, :active_scaffold_human_condition_datetime
+  alias_method :active_scaffold_human_condition_datetime_picker, :active_scaffold_human_condition_datetime
   include ActiveScaffold::Bridges::DatePicker::Helper::SearchColumnHelpers
+  alias_method :active_scaffold_search_datetime_picker_field, :active_scaffold_search_date_picker_field
   include ActiveScaffold::Bridges::DatePicker::Helper::FormColumnHelpers
   alias_method :active_scaffold_input_datetime_picker, :active_scaffold_input_date_picker
   include ActiveScaffold::Bridges::DatePicker::Helper::DatepickerColumnHelpers
 end
 ActiveScaffold::Finder::ClassMethods.module_eval do
   prepend ActiveScaffold::Bridges::DatePicker::Finder
-  include ActiveScaffold::Bridges::Shared::DateBridge::Finder::ClassMethods
-  alias_method :condition_for_date_picker_type, :condition_for_date_bridge_type
-  alias_method :condition_for_datetime_picker_type, :condition_for_date_picker_type
+  alias_method :condition_for_date_picker_type, :condition_for_datetime
+  alias_method :condition_for_datetime_picker_type, :condition_for_datetime
 end
 ActiveScaffold::AttributeParams.module_eval do
   prepend ActiveScaffold::Bridges::DatePicker::AttributeParams

data/lib/active_scaffold/bridges/date_picker/helper.rb

@@ -1,6 +1,7 @@
 module ActiveScaffold::Bridges
   class DatePicker
     module Helper
+      UNSUPPORTED_FORMAT_OPTIONS = /%[cUWwxXZ]/
       DATE_FORMAT_CONVERSION = {
         /%a/ => 'D',
         /%A/ => 'DD',
@@ -19,7 +20,7 @@ module ActiveScaffold::Bridges
         /%p/ => 'tt',
         /%S/ => 'ss',
         /%z/ => 'z',
-        /%[cUWwxXZ]/ => ''
+        UNSUPPORTED_FORMAT_OPTIONS => ''
       }.freeze
 
       def self.date_options_for_locales
@@ -83,9 +84,8 @@ module ActiveScaffold::Bridges
 
       def self.to_datepicker_format(rails_format)
         return nil if rails_format.nil?
-        unsupported = DATE_FORMAT_CONVERSION.index ''
-        if rails_format =~ unsupported
-          options = unsupported.to_s.scan(/\[(.*)\]/).dig(0, 0)&.each_char&.map { |c| "%#{c}" }
+        if rails_format.match?(UNSUPPORTED_FORMAT_OPTIONS)
+          options = UNSUPPORTED_FORMAT_OPTIONS.to_s.scan(/\[(.*)\]/).dig(0, 0)&.each_char&.map { |c| "%#{c}" }
           Rails.logger.warn(
             "AS DatePicker::Helper: rails date format #{rails_format} includes options "\
             "which can't be converted to jquery datepicker format. "\
@@ -148,15 +148,15 @@ module ActiveScaffold::Bridges
       end
 
       module SearchColumnHelpers
-        def active_scaffold_search_date_bridge_calendar_control(column, options, current_search, name)
+        def active_scaffold_search_date_picker_field(column, options, current_search, name, ui_options: column.options)
           value =
             if current_search.is_a? Hash
               controller.class.condition_value_for_datetime(column, current_search[name], column.search_ui == :date_picker ? :to_date : :to_time)
             else
               current_search
             end
-          options = column.options.merge(options).except!(:include_blank, :discard_time, :discard_date, :value)
-          options = active_scaffold_input_text_options(options.merge(column.options))
+          options = ui_options.merge(options).except!(:include_blank, :discard_time, :discard_date, :value)
+          options = active_scaffold_input_text_options(options)
           format = datepicker_format(options, column.search_ui)
           options[:class] << " #{column.search_ui}"
           options[:style] = 'display: none' if options[:show] == false # hide only if asked to hide
@@ -168,9 +168,9 @@ module ActiveScaffold::Bridges
       end
 
       module FormColumnHelpers
-        def active_scaffold_input_date_picker(column, options)
+        def active_scaffold_input_date_picker(column, options, ui_options: column.options)
           record = options[:object]
-          options = active_scaffold_input_text_options(options.merge(column.options))
+          options = active_scaffold_input_text_options(options.merge(ui_options))
           options[:class] << " #{column.form_ui}"
 
           format = datepicker_format(options, column.form_ui)

data/lib/active_scaffold/bridges/date_picker.rb

@@ -12,6 +12,8 @@ module ActiveScaffold::Bridges
     def self.jquery_ui_included?
       Jquery::Rails.const_defined?('JQUERY_UI_VERSION') || Jquery.const_defined?('Ui') if Object.const_defined?('Jquery')
     end
+    mattr_accessor :default_ui
+    @@default_ui = true
 
     def self.stylesheets
       'jquery-ui-timepicker-addon'

data/lib/active_scaffold/bridges/dragonfly/form_ui.rb

@@ -1,11 +1,11 @@
 module ActiveScaffold
   module Helpers
     module FormColumnHelpers
-      def active_scaffold_input_dragonfly(column, options)
+      def active_scaffold_input_dragonfly(column, options, ui_options: column.options)
         record = options[:object]
         dragonfly = record.send(column.name.to_s)
-        content = active_scaffold_column_dragonfly(record, column) if dragonfly.present?
-        active_scaffold_file_with_remove_link(column, options, content, 'remove_', 'dragonfly_controls')
+        content = active_scaffold_column_dragonfly(record, column, ui_options: ui_options) if dragonfly.present?
+        active_scaffold_file_with_remove_link(column, options, content, 'remove_', 'dragonfly_controls', ui_options: ui_options)
       end
     end
   end

data/lib/active_scaffold/bridges/dragonfly/list_ui.rb

@@ -1,20 +1,20 @@
 module ActiveScaffold
   module Helpers
     module ListColumnHelpers
-      def active_scaffold_column_dragonfly(record, column)
+      def active_scaffold_column_dragonfly(record, column, ui_options: column.options)
         attachment = record.send(column.name.to_s)
         return nil if attachment.blank?
         content =
           if attachment.image?
-            image_tag(attachment.thumb(column.options[:thumb] || ActiveScaffold::Bridges::Dragonfly::DragonflyBridgeHelpers.thumbnail_style).url, :border => 0)
+            image_tag(attachment.thumb(ui_options[:thumb] || ActiveScaffold::Bridges::Dragonfly::DragonflyBridgeHelpers.thumbnail_style).url, :border => 0)
           else
             attachment.name
           end
-        link_to(content, dragonfly_url_for_attachment(attachment, record, column), :target => '_blank', rel: 'noopener noreferrer')
+        link_to(content, dragonfly_url_for_attachment(attachment, record, column, ui_options: ui_options), :target => '_blank', rel: 'noopener noreferrer')
       end
 
-      def dragonfly_url_for_attachment(attachment, record, column)
-        url_method = column.options[:private_store] ? :url : :remote_url
+      def dragonfly_url_for_attachment(attachment, record, column, ui_options: column.options)
+        url_method = ui_options[:private_store] ? :url : :remote_url
         attachment.send(url_method)
       end
     end

data/lib/active_scaffold/bridges/file_column/form_ui.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a Form Column
     module FormColumnHelpers
-      def active_scaffold_input_file_column(column, options)
+      def active_scaffold_input_file_column(column, options, ui_options: column.options)
         record = options[:object]
         if record.send(column.name)
           # we already have a value? display the form for deletion.

data/lib/active_scaffold/bridges/file_column/list_ui.rb

@@ -2,18 +2,18 @@ module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a List Column
     module ListColumnHelpers
-      def active_scaffold_column_download_link_with_filename(record, column)
+      def active_scaffold_column_download_link_with_filename(record, column, ui_options: column.options)
         return nil if record.send(column.name).nil?
         active_scaffold_column_download_link(record, column, File.basename(record.send(column.name)))
       end
 
-      def active_scaffold_column_download_link(record, column, label = nil)
+      def active_scaffold_column_download_link(record, column, label = nil, ui_options: column.options)
         return nil if record.send(column.name).nil?
         label ||= as_(:download)
         link_to(label, url_for_file_column(record, column.name.to_s), :popup => true)
       end
 
-      def active_scaffold_column_thumbnail(record, column)
+      def active_scaffold_column_thumbnail(record, column, ui_options: column.options)
         return nil if record.send(column.name).nil?
         link_to(
           image_tag(url_for_file_column(record, column.name.to_s, 'thumb'), :border => 0),

data/lib/active_scaffold/bridges/file_column/test/functional/file_column_keep_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 require File.expand_path('../mock_model.rb', __dir__)
 require File.expand_path('../../file_column_helpers.rb', __dir__)
 
-class DeleteFileColumnTest < MiniTest::Test
+class DeleteFileColumnTest < Minitest::Test
   def setup
     MockModel.extend ActiveScaffold::Bridges::FileColumn::FileColumnHelpers
     ActiveScaffold::Bridges::FileColumn::FileColumnHelpers.generate_delete_helpers(MockModel)