active_scaffold 3.6.20 → 3.7.1

data/lib/active_scaffold/bridges/paper_trail/actions.rb

@@ -12,7 +12,10 @@ module ActiveScaffold::Actions
     def deleted
       query = PaperTrail::Version.destroys.where(:item_type => active_scaffold_config.model.name)
       if nested? && nested.child_association&.belongs_to? && PaperTrail::Version.respond_to?(:where_object)
-        query = query.where_object(nested.child_association.foreign_key => nested.parent_id)
+        foreign_key = nested.child_association.foreign_key
+        parent_id = nested.parent_id
+        parent_id = parent_id&.to_i if self.class.active_scaffold_config.columns[foreign_key]&.number?
+        query = query.where_object(foreign_key => parent_id)
       end
       pager = Paginator.new(query.count, active_scaffold_config.list.per_page) do |offset, per_page|
         query.offset(offset).limit(per_page).map(&:reify)

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

@@ -1,11 +1,11 @@
 module ActiveScaffold
   module Helpers
     module FormColumnHelpers
-      def active_scaffold_input_paperclip(column, options)
+      def active_scaffold_input_paperclip(column, options, ui_options: column.options)
         record = options[:object]
         paperclip = record.send(column.name.to_s)
-        content = active_scaffold_column_paperclip(record, column) if paperclip.file?
-        active_scaffold_file_with_remove_link(column, options, content, 'delete_', 'paperclip_controls')
+        content = active_scaffold_column_paperclip(record, column, ui_options: ui_options) if paperclip.file?
+        active_scaffold_file_with_remove_link(column, options, content, 'delete_', 'paperclip_controls', ui_options: ui_options)
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module ActiveScaffold
   module Helpers
     module ListColumnHelpers
-      def active_scaffold_column_paperclip(record, column)
+      def active_scaffold_column_paperclip(record, column, ui_options: column.options)
         paperclip = record.send(column.name.to_s)
         return nil unless paperclip.file?
         content =

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

@@ -10,21 +10,21 @@ class ActiveScaffold::Bridges::RecordSelect
 
     module FormColumnHelpers
       # requires RecordSelect plugin to be installed and configured.
-      def active_scaffold_input_record_select(column, options)
+      def active_scaffold_input_record_select(column, options, ui_options: column.options)
         record = options.delete(:object)
         if column.association&.singular?
-          multiple = column.options.dig(:html_options, :multiple)
-          html = active_scaffold_record_select(record, column, options, record.send(column.name), multiple)
-          html << active_scaffold_new_record_subform(column, record, options) if column.options[:add_new]
+          multiple = ui_options.dig(:html_options, :multiple)
+          html = active_scaffold_record_select(record, column, options, record.send(column.name), multiple, ui_options: ui_options)
+          html << active_scaffold_new_record_subform(column, record, options, ui_options: ui_options) if ui_options[:add_new]
           html
         elsif column.association&.collection?
-          active_scaffold_record_select(record, column, options, record.send(column.name), true)
+          active_scaffold_record_select(record, column, options, record.send(column.name), true, ui_options: ui_options)
         else
-          active_scaffold_record_select_autocomplete(record, column, options)
+          active_scaffold_record_select_autocomplete(record, column, options, ui_options: ui_options)
         end
       end
 
-      def active_scaffold_record_select(record, column, options, value, multiple)
+      def active_scaffold_record_select(record, column, options, value, multiple, ui_options: column.options)
         unless column.association
           raise ArgumentError, "record_select can only work against associations (and #{column.name} is not). "\
           'A common mistake is to specify the foreign key field (like :user_id), instead of the association (:user).'
@@ -43,7 +43,7 @@ class ActiveScaffold::Bridges::RecordSelect
         record_select_options = active_scaffold_input_text_options(options).merge(
           :controller => remote_controller
         )
-        record_select_options.merge!(column.options)
+        record_select_options.merge!(ui_options)
 
         html =
           if multiple
@@ -51,29 +51,29 @@ class ActiveScaffold::Bridges::RecordSelect
           else
             record_select_field(options[:name], value || klass.new, record_select_options)
           end
-        html = self.class.field_error_proc.call(html, self) if record.errors[column.name].any?
+        html = instance_exec(html, self, &self.class.field_error_proc) if record.errors[column.name].any?
         html
       end
 
-      def active_scaffold_record_select_autocomplete(record, column, options)
+      def active_scaffold_record_select_autocomplete(record, column, options, ui_options: column.options)
         record_select_options = active_scaffold_input_text_options(options).reverse_merge(
           :controller => active_scaffold_controller_for(record.class).controller_path
-        ).merge(column.options)
+        ).merge(ui_options)
         html = record_select_autocomplete(options[:name], record, record_select_options)
-        html = self.class.field_error_proc.call(html, self) if record.errors[column.name].any?
+        html = instance_exec(html, self, &self.class.field_error_proc) if record.errors[column.name].any?
         html
       end
     end
 
     module SearchColumnHelpers
-      def active_scaffold_search_record_select(column, options)
-        value = field_search_record_select_value(column, options[:value])
-        active_scaffold_record_select(options[:object], column, options, value, column.options[:multiple])
+      def active_scaffold_search_record_select(column, options, ui_options: column.options)
+        value = field_search_record_select_value(column, options[:value], ui_options: ui_options)
+        active_scaffold_record_select(options[:object], column, options, value, ui_options[:multiple], ui_options: ui_options)
       end
 
-      def field_search_record_select_value(column, value)
+      def field_search_record_select_value(column, value, ui_options: column.options)
         return if value.blank?
-        if column.options[:multiple]
+        if ui_options[:multiple]
           column.association.klass.find value.collect!(&:to_i)
         else
           column.association.klass.find(value.to_i)

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

@@ -14,16 +14,16 @@ class ActiveScaffold::Bridges::TinyMce
       # but not the plugins, toolbars etc.
       # The other one is :tinymce_config, which selects the config to use from tinymce.yml.
       # See the tinymce-rails gem documentation for usage.
-      def active_scaffold_input_text_editor(column, options)
-        options[:class] = "#{options[:class]} mceEditor #{column.options[:class]}".strip
+      def active_scaffold_input_text_editor(column, options, ui_options: column.options)
+        options[:class] = "#{options[:class]} mceEditor #{ui_options[:class]}".strip
 
-        settings = tinymce_configuration(column.options[:tinymce_config] || :default).options
-                                                                                     .reject { |k, _v| k == 'selector' }
-                                                                                     .merge(column.options[:tinymce] || {})
+        settings = tinymce_configuration(ui_options[:tinymce_config] || :default).options
+                                                                                 .reject { |k, _v| k == 'selector' }
+                                                                                 .merge(ui_options[:tinymce] || {})
         options['data-tinymce'] = settings.to_json if ActiveScaffold.js_framework != :prototype
 
         html = []
-        html << send(override_input(:textarea), column, options)
+        html << send(override_input(:textarea), column, options, ui_options: ui_options)
         if ActiveScaffold.js_framework == :prototype && (request.xhr? || params[:iframe])
           html << javascript_tag("tinyMCE.settings = #{settings.to_json}; tinyMCE.execCommand('mceAddEditor', false, '#{options[:id]}');")
         end

data/lib/active_scaffold/bridges/tiny_mce.rb

@@ -11,7 +11,7 @@ class ActiveScaffold::Bridges::TinyMce < ActiveScaffold::DataStructures::Bridge
   def self.javascripts
     case ActiveScaffold.js_framework
     when :jquery
-      ['tinymce-jquery', 'jquery/tiny_mce_bridge']
+      ['tinymce', 'jquery/tiny_mce_bridge']
     when :prototype
       ['tinymce', 'prototype/tiny_mce_bridge']
     end

data/lib/active_scaffold/bridges/usa_state_select/usa_state_select_helper.rb

@@ -1,13 +1,8 @@
 module ActiveScaffold::Bridges
   class UsaStateSelect
     module UsaStateSelectHelpers
-      def usa_state_select_options(options)
-        # TODO: remove when rails 3.2 support is dropped
-        defined?(ActionView::Helpers::InstanceTag) ? options[:object] : options
-      end
-
       def usa_state_select(object, method, priority_states = nil, options = {}, html_options = {})
-        ActionView::Helpers::Tags::UsaStateSelect.new(object, method, self, usa_state_select_options(options)).to_usa_state_select_tag(priority_states, options, html_options)
+        ActionView::Helpers::Tags::UsaStateSelect.new(object, method, self, options).to_usa_state_select_tag(priority_states, options, html_options)
       end
     end
 
@@ -63,18 +58,18 @@ module ActiveScaffold::Bridges
     end
 
     module FormColumnHelpers
-      def active_scaffold_input_usa_state(column, options)
+      def active_scaffold_input_usa_state(column, options, ui_options: column.options)
         select_options = {:prompt => as_(:_select_)}
         select_options.merge!(options)
-        options.reverse_merge!(column.options).except!(:prompt, :priority)
+        options.reverse_merge!(ui_options).except!(:prompt, :priority)
         active_scaffold_select_name_with_multiple options
-        usa_state_select(:record, column.name, column.options[:priority], select_options, options.except(:object))
+        usa_state_select(:record, column.name, ui_options[:priority], select_options, options.except(:object))
       end
     end
 
     module SearchColumnHelpers
-      def active_scaffold_search_usa_state(column, options)
-        active_scaffold_input_usa_state(column, options.merge!(:selected => options.delete(:value)))
+      def active_scaffold_search_usa_state(column, options, ui_options: column.options)
+        active_scaffold_input_usa_state(column, options.merge!(:selected => options.delete(:value)), ui_options: ui_options)
       end
     end
   end

data/lib/active_scaffold/bridges.rb

@@ -1,9 +1,6 @@
 module ActiveScaffold
   module Bridges
     ActiveScaffold.autoload_subdir('bridges', self)
-    module Shared
-      autoload :DateBridge, 'active_scaffold/bridges/shared/date_bridge'
-    end
 
     mattr_accessor :bridges
     mattr_accessor :bridges_run

data/lib/active_scaffold/config/core.rb

@@ -112,7 +112,7 @@ module ActiveScaffold::Config
     def columns=(val)
       @columns._inheritable = val.collect(&:to_sym)
       # Add virtual columns
-      @columns << val.collect { |c| c.to_sym unless @columns[c.to_sym] }.compact
+      @columns.add(*val)
     end
 
     # lets you override the global ActiveScaffold frontend for a specific controller

data/lib/active_scaffold/config/field_search.rb

@@ -7,6 +7,7 @@ module ActiveScaffold::Config
       super
       @text_search = self.class.text_search
       @human_conditions = self.class.human_conditions
+      @floating_footer = self.class.floating_footer
     end
 
     # global level configuration
@@ -29,6 +30,10 @@ module ActiveScaffold::Config
     cattr_accessor :human_conditions, instance_accessor: false
     @@human_conditions = false
 
+    # whether footer should float when form is too long to fit in the screen, so footer is always available while scrolling
+    class_attribute :floating_footer, instance_accessor: false
+    @@floating_footer = false
+
     # instance-level configuration
     # ----------------------------
 
@@ -71,8 +76,11 @@ module ActiveScaffold::Config
     # instead of just filtered you may show the user a humanized search condition statment
     attr_accessor :human_conditions
 
+    # whether footer should float when form is too long to fit in the screen, so footer is always available while scrolling
+    attr_accessor :floating_footer
+
     UserSettings.class_eval do
-      user_attr :optional_columns, :group_options, :grouped_columns, :human_conditions
+      user_attr :optional_columns, :group_options, :grouped_columns, :human_conditions, :floating_footer
     end
   end
 end

data/lib/active_scaffold/config/form.rb

@@ -5,6 +5,7 @@ module ActiveScaffold::Config
       @show_unauthorized_columns = self.class.show_unauthorized_columns
       @refresh_list = self.class.refresh_list
       @persistent = self.class.persistent
+      @floating_footer = self.class.floating_footer
 
       # no global setting here because multipart should only be set for specific forms
       @multipart = false
@@ -23,6 +24,10 @@ module ActiveScaffold::Config
     class_attribute :refresh_list, instance_accessor: false
     @@refresh_list = false
 
+    # whether footer should float when form is too long to fit in the screen, so footer is always available while scrolling
+    class_attribute :floating_footer, instance_accessor: false
+    @@floating_footer = false
+
     # instance-level configuration
     # ----------------------------
 
@@ -41,6 +46,9 @@ module ActiveScaffold::Config
     # whether we should refresh list after create or not
     attr_accessor :refresh_list
 
+    # whether footer should float when form is too long to fit in the screen, so footer is always available while scrolling
+    attr_accessor :floating_footer
+
     columns_accessor :columns do
       columns.exclude :created_on, :created_at, :updated_on, :updated_at, :as_marked
       columns.exclude(*@core.columns.collect { |c| c.name if c.association&.polymorphic? }.compact)
@@ -53,7 +61,7 @@ module ActiveScaffold::Config
     end
 
     UserSettings.class_eval do
-      user_attr :persistent, :refresh_list, :show_unauthorized_columns
+      user_attr :persistent, :refresh_list, :show_unauthorized_columns, :floating_footer
 
       attr_writer :multipart
       def multipart?

data/lib/active_scaffold/constraints.rb

@@ -11,13 +11,27 @@ module ActiveScaffold
       @active_scaffold_constraints ||= active_scaffold_embedded_params[:constraints] || {}
     end
 
+    def register_constraint?(column_name, value)
+      if params_hash?(value)
+        false
+      elsif value.is_a?(Array)
+        column = active_scaffold_config.columns[column_name]
+        column && value.size > (column.association&.polymorphic? ? 2 : 1)
+      else
+        true
+      end
+    end
+
     # For each enabled action, adds the constrained columns to the ActionColumns object (if it exists).
     # This lets the ActionColumns object skip constrained columns.
     #
-    # If the constraint value is a Hash, then we assume the constraint is a multi-level association constraint (the reverse of a has_many :through) and we do NOT register the constraint column.
+    # If the constraint value is a Hash, then we assume the constraint is a multi-level association constraint
+    # (the reverse of a has_many :through) and we do NOT register the constraint column.
+    # If the constraint value is an Array, or Array with more than 2 items for polymorphic column,
+    # we do NOT register the constraint column, as records will have different values in the column.
     def register_constraints_with_action_columns(constrained_fields = nil)
       constrained_fields ||= []
-      constrained_fields |= active_scaffold_constraints.reject { |_, v| params_hash?(v) }.keys.collect(&:to_sym)
+      constrained_fields |= active_scaffold_constraints.select { |k, v| register_constraint?(k, v) }.keys.collect(&:to_sym)
       exclude_actions = []
       %i[list update].each do |action_name|
         if active_scaffold_config.actions.include? action_name
@@ -111,10 +125,10 @@ module ActiveScaffold
       value = association.klass.find(value).send(association.primary_key) if association.primary_key
 
       if association.polymorphic?
-        unless value.is_a?(Array) && value.size == 2
+        unless value.is_a?(Array) && value.size >= 2
           raise ActiveScaffold::MalformedConstraint, polymorphic_constraint_error(association), caller
         end
-        condition = {table => {association.foreign_type => value[0], field => value[1]}}
+        condition = {table => {association.foreign_type => value[0], field => value.size == 2 ? value[1] : value[1..-1]}}
       else
         condition = {table => {field.to_s => value}}
       end
@@ -149,11 +163,12 @@ module ActiveScaffold
           if column.association.collection?
             record.send(k.to_s).send(:<<, column.association.klass.find(v))
           elsif column.association.polymorphic?
-            unless v.is_a?(Array) && v.size == 2
+            unless v.is_a?(Array) && v.size >= 2
               raise ActiveScaffold::MalformedConstraint, polymorphic_constraint_error(column.association), caller
             end
-            record.send("#{k}=", v[0].constantize.find(v[1]))
-          elsif !column.association.source_reflection&.options&.include?(:through) # regular singular association, or one-level through association
+            record.send("#{k}=", v[0].constantize.find(v[1])) if v.size == 2
+          elsif !column.association.source_reflection&.options&.include?(:through) && # regular singular association, or one-level through association
+                !v.is_a?(Array)
             record.send("#{k}=", column.association.klass.find(v))
 
             # setting the belongs_to side of a has_one isn't safe. if the has_one was already

data/lib/active_scaffold/core.rb

@@ -257,6 +257,8 @@ module ActiveScaffold
     def self.column_type_cast(value, column)
       if defined?(ActiveRecord) && column.is_a?(ActiveRecord::ConnectionAdapters::Column)
         active_record_column_type_cast(value, column)
+      elsif defined?(ActiveModel) && column.is_a?(ActiveModel::Attribute)
+        active_record_column_type_cast(value, column.type)
       elsif defined?(Mongoid) && column.is_a?(Mongoid::Fields::Standard)
         mongoid_column_type_cast(value, column)
       else
@@ -269,16 +271,10 @@ module ActiveScaffold
       column.type.evolve value
     end
 
-    def self.active_record_column_type_cast(value, column)
-      return Time.zone.at(value.to_i) if value =~ /\A\d+\z/ && %i[time datetime].include?(column.type)
-      if Rails.version < '5.0'
-        column.type_cast_from_user value
-      elsif column.type.respond_to? :cast # jruby-jdbc and rails 5
-        column.type.cast value
-      else
-        cast_type = ActiveRecord::Type.lookup column.type
-        cast_type ? cast_type.cast(value) : value
-      end
+    def self.active_record_column_type_cast(value, column_or_type)
+      return Time.zone.at(value.to_i) if value =~ /\A\d+\z/ && %i[time datetime].include?(column_or_type.type)
+      cast_type = column_or_type.is_a?(ActiveRecord::ConnectionAdapters::Column) ? ActiveRecord::Type.lookup(column_or_type.type) : column_or_type
+      cast_type ? cast_type.cast(value) : value
     end
   end
 end

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -98,31 +98,6 @@ module ActiveScaffold::DataStructures
       visible_columns(options.reverse_merge(flatten: true)).map(&:name)
     end
 
-    def each(options = nil, &proc)
-      if options
-        ActiveSupport::Deprecation.warn 'use each_column'
-        each_column(options, &proc)
-      else
-        super(&proc)
-      end
-    end
-
-    def collect_visible(options = {}, &proc)
-      ActiveSupport::Deprecation.warn "use visible_columns#{"(#{options.inspect})" if options.present?}#{'.map(&proc)' if proc}"
-      columns = visible_columns(options)
-      proc ? columns.map(&proc) : columns
-    end
-
-    def names
-      ActiveSupport::Deprecation.warn 'use visible_columns.map(&:name)'
-      visible_columns(flatten: true).map(&:name)
-    end
-
-    def names_without_auth_check
-      ActiveSupport::Deprecation.warn 'use to_a'
-      to_a
-    end
-
     def action_name
       @action.user_settings_key
     end

data/lib/active_scaffold/data_structures/action_links.rb

@@ -144,7 +144,7 @@ module ActiveScaffold::DataStructures
     end
 
     def method_missing(name, *args, &block)
-      return super if name =~ /[!?]$/
+      return super if name.match?(/[!?]$/)
       class_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{name}(label = nil) # rubocop:disable Style/CommentedKeyword
           @#{name} ||= subgroup('#{name}'.to_sym, label)

data/lib/active_scaffold/data_structures/association/abstract.rb

@@ -54,6 +54,14 @@ module ActiveScaffold::DataStructures::Association
       through? && through_reflection.collection?
     end
 
+    def primary_key
+      @association.options[:primary_key]
+    end
+
+    def counter_cache
+      @association.options[:counter_cache]
+    end
+
     def polymorphic?
       false
     end

data/lib/active_scaffold/data_structures/association/active_mongoid.rb

@@ -5,6 +5,14 @@ module ActiveScaffold::DataStructures::Association
       klass.am_relations.values
     end
 
+    def primary_key
+      @association[:primary_key]
+    end
+
+    def counter_cache
+      @association[:counter_cache]
+    end
+
     def inverse_klass
       as ? @association[:inverse_class_name].constantize : super
     end

data/lib/active_scaffold/data_structures/association/active_record.rb

@@ -30,14 +30,6 @@ module ActiveScaffold::DataStructures::Association
       @association.active_record
     end
 
-    def primary_key
-      @association.options[:primary_key]
-    end
-
-    def counter_cache
-      @association.options[:counter_cache]
-    end
-
     def as
       @association.options[:as]
     end
@@ -64,11 +56,7 @@ module ActiveScaffold::DataStructures::Association
     end
 
     def counter_cache_hack?
-      if has_many?
-        Rails.version < '5.0' && as
-      elsif belongs_to?
-        counter_cache && (Rails.version >= '5.0' || !polymorphic?)
-      end
+      belongs_to? && counter_cache && Rails.version < '6.0'
     end
 
     protected

data/lib/active_scaffold/data_structures/association/mongoid.rb

@@ -2,15 +2,28 @@ module ActiveScaffold::DataStructures::Association
   class Mongoid < Abstract
     delegate :inverse_klass, :as, :dependent, :inverse, to: :@association
 
+    def belongs_to?
+      # once Ruby 2.6 support is dropped, use macro_mapping? always
+      defined?(::Mongoid::Association) ? macro_mapping?(:belongs_to) : super
+    end
+
+    def has_one? # rubocop:disable Naming/PredicateName
+      defined?(::Mongoid::Association) ? macro_mapping?(:has_one) : super
+    end
+
+    def has_many? # rubocop:disable Naming/PredicateName
+      defined?(::Mongoid::Association) ? macro_mapping?(:has_many) : super
+    end
+
+    def habtm?
+      defined?(::Mongoid::Association) ? macro_mapping?(:has_and_belongs_to_many) : super
+    end
+
     # polymorphic belongs_to
     def polymorphic?
       belongs_to? && @association.polymorphic?
     end
 
-    def primary_key
-      @association[:primary_key]
-    end
-
     def association_primary_key
       @association.primary_key
     end
@@ -19,10 +32,6 @@ module ActiveScaffold::DataStructures::Association
       @association.type
     end
 
-    def counter_cache
-      @association[:counter_cache]
-    end
-
     def table_name
       @association.klass.collection.name
     end
@@ -38,5 +47,9 @@ module ActiveScaffold::DataStructures::Association
     def self.reflect_on_all_associations(klass)
       klass.relations.values
     end
+
+    def macro_mapping?(macro)
+      @association.is_a? ::Mongoid::Association::MACRO_MAPPING[macro]
+    end
   end
 end