active_scaffold 3.6.0.rc1 → 3.6.2

data/lib/active_scaffold/bridges/bitfields.rb

@@ -1,6 +1,6 @@
 class ActiveScaffold::Bridges::Bitfields < ActiveScaffold::DataStructures::Bridge
   def self.install
-    require File.join(File.dirname(__FILE__), 'bitfields/bitfields_bridge')
+    Dir[File.join(__dir__, 'bitfields', '*.rb')].each { |file| require file }
     ActiveScaffold::Config::Core.send :prepend, ActiveScaffold::Bridges::Bitfields::BitfieldsBridge
     ActiveScaffold::Config::Core.after_config_callbacks << :_setup_bitfields
   end

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

@@ -0,0 +1,19 @@
+module ActiveScaffold
+  module Bridges
+    class Bitfields
+      module ListColumnHelpers
+        def format_column_value(record, column, value = nil)
+          if record.class.respond_to?(:bitfields) && record.class.bitfields&.include?(column.name)
+            value = record.bitfield_values(column.name).select { |_, v| v }.keys
+            safe_join active_scaffold_config.columns.select { |c| c.name.in? value }.map(&:label), ', '
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end
+ActionView::Base.class_eval do
+  include ActiveScaffold::Bridges::Bitfields::ListColumnHelpers
+end

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

@@ -11,7 +11,9 @@ module ActiveScaffold::Actions
 
     def deleted
       query = PaperTrail::Version.destroys.where(:item_type => active_scaffold_config.model)
-      query = query.where_object(nested.child_association.foreign_key => nested.parent_id) if nested? && nested.child_association.belongs_to? && PaperTrail::Version.respond_to?(:where_object)
+      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)
+      end
       pager = Paginator.new(query.count, active_scaffold_config.list.per_page) do |offset, per_page|
         query.offset(offset).limit(per_page).map(&:reify)
       end

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

@@ -14,7 +14,9 @@ class ActiveScaffold::Bridges::RecordSelect
         record = options.delete(:object)
         if column.association&.singular?
           multiple = column.options.dig(:html_options, :multiple)
-          active_scaffold_record_select(record, column, options, record.send(column.name), 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]
+          html
         elsif column.association&.collection?
           active_scaffold_record_select(record, column, options, record.send(column.name), true)
         else

data/lib/active_scaffold/config/list.rb

@@ -292,7 +292,7 @@ module ActiveScaffold::Config
             @_sorting = sorting
           else
             @_sorting = default_sorting
-            @_sorting.set(@sorting) if @sorting
+            @_sorting.set(*@sorting) if @sorting
             if @conf.columns.constraint_columns.present?
               @_sorting.constraint_columns = @conf.columns.constraint_columns
             end

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -124,7 +124,7 @@ module ActiveScaffold::DataStructures
     end
 
     def action_name
-      @action.class.name.demodulize.underscore
+      @action.user_settings_key
     end
 
     def columns_key

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

@@ -12,13 +12,10 @@ module ActiveScaffold::DataStructures::Association
 
     def klass(record = nil)
       if polymorphic?
-        record&.send(foreign_type)&.constantize
+        record&.send(foreign_type)&.safe_constantize
       else
         @association.klass
       end
-    rescue NameError => e
-      Rails.logger.warn "#{e.message}\n#{e.backtrace.join("\n")}"
-      nil
     end
 
     def belongs_to?

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -66,6 +66,10 @@ module ActiveScaffold::DataStructures
     def sorted?(*)
       false
     end
+
+    def match_model?(model)
+      false
+    end
   end
 
   class NestedInfoAssociation < NestedInfo
@@ -100,6 +104,14 @@ module ActiveScaffold::DataStructures
       association.through?
     end
 
+    def match_model?(model)
+      if association.polymorphic?
+        child_association&.inverse_klass == model
+      else
+        association.klass == model
+      end
+    end
+
     def sorted?(chain)
       default_sorting(chain).present?
     end
@@ -119,8 +131,8 @@ module ActiveScaffold::DataStructures
     protected
 
     def setup_constrained_fields
-      @constrained_fields = Array(association.foreign_key).map(&:to_sym) unless association.belongs_to?
-      @constrained_fields ||= []
+      @constrained_fields = [] if association.belongs_to? || association.through?
+      @constrained_fields ||= Array(association.foreign_key).map(&:to_sym)
       return unless child_association && child_association != association
 
       @constrained_fields << child_association.name

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -45,31 +45,7 @@ module ActiveScaffold #:nodoc:
           @_view_paths ||= lookup_context.view_paths.clone
           @_last_template ||= lookup_context.last_template
         end
-        parts = @virtual_path.split('/')
-        template = parts.pop
-        prefix = parts.join('/')
-
-        options = args[1] || {}
-        options[:locals] ||= {}
-        if view_stack.last
-          options[:locals] = view_stack.last[:locals].merge!(options[:locals]) if view_stack.last[:locals]
-          options[:object] ||= view_stack.last[:object] if view_stack.last[:object]
-        end
-        options[:template] = template
-        # if prefix is active_scaffold_overrides we must try to render with this prefix in following paths
-        if prefix != 'active_scaffold_overrides'
-          options[:prefixes] = lookup_context.prefixes.drop((lookup_context.prefixes.find_index(prefix) || -1) + 1)
-        else
-          options[:prefixes] = ['active_scaffold_overrides']
-          last_view_path = File.expand_path(File.dirname(File.dirname(lookup_context.last_template.inspect)), Rails.root)
-          new_view_paths = view_paths.drop(view_paths.find_index { |path| path.to_s == last_view_path } + 1)
-          if @lookup_context
-            @lookup_context = build_lookup_context(new_view_paths)
-          else
-            lookup_context.view_paths = new_view_paths
-          end
-        end
-        result = super options
+        result = super options_for_render_super(args[1])
         @lookup_context = @_lookup_context if @_lookup_context # rails 6
         lookup_context.view_paths = @_view_paths if @_view_paths # rails < 6
         lookup_context.last_template = @_last_template if @_last_template # rails < 6
@@ -103,6 +79,46 @@ module ActiveScaffold #:nodoc:
 
     private
 
+    def options_for_render_super(options)
+      options ||= {}
+      options[:locals] ||= {}
+      if view_stack.last
+        options[:locals] = view_stack.last[:locals].merge!(options[:locals]) if view_stack.last[:locals]
+        options[:object] ||= view_stack.last[:object] if view_stack.last[:object]
+      end
+
+      parts = @virtual_path.split('/')
+      options[:template] = parts.pop
+      prefix = parts.join('/')
+      # if prefix is active_scaffold_overrides we must try to render with this prefix in following paths
+      if prefix != 'active_scaffold_overrides'
+        options[:prefixes] = lookup_context.prefixes.drop((lookup_context.prefixes.find_index(prefix) || -1) + 1)
+      else
+        options[:prefixes] = ['active_scaffold_overrides']
+        update_view_paths
+      end
+      options
+    end
+
+    def update_view_paths
+      last_view_path =
+        if @lookup_context # rails 6
+          File.expand_path(File.dirname(File.dirname(@lookup_context.last_template.short_identifier.to_s)), Rails.root)
+        else
+          File.expand_path(File.dirname(File.dirname(lookup_context.last_template.inspect)), Rails.root)
+        end
+      new_view_paths = view_paths.drop(view_paths.find_index { |path| path.to_s == last_view_path } + 1)
+      if @lookup_context # rails 6
+        if respond_to? :build_lookup_context # rails 6.0
+          build_lookup_context(new_view_paths)
+        else # rails 6.1
+          @lookup_context = ActionView::LookupContext.new(new_view_paths)
+        end
+      else
+        lookup_context.view_paths = new_view_paths
+      end
+    end
+
     def render_embedded(options)
       require 'digest/md5'
 
@@ -153,5 +169,30 @@ module ActionView
     Base.class_eval do
       include ActiveScaffold::RenderingHelper
     end
+
+    if Gem.loaded_specs['rails'].version.segments.first >= 6
+      RenderingHelper.class_eval do
+        # override the render method to use our @lookup_context instead of the
+        # memoized @_lookup_context
+        def render(options = {}, locals = {}, &block)
+          case options
+          when Hash
+            in_rendering_context(options) do |_|
+              # previously set view paths and lookup context are lost here
+              # if you use view_renderer, so instead create a new renderer
+              # with our context
+              temp_renderer = ActionView::Renderer.new(@lookup_context)
+              if block_given?
+                temp_renderer.render_partial(self, options.merge(partial: options[:layout]), &block)
+              else
+                temp_renderer.render(self, options)
+              end
+            end
+          else
+            view_renderer.render_partial(self, partial: options, locals: locals, &block)
+          end
+        end
+      end
+    end
   end
 end

data/lib/active_scaffold/extensions/localize.rb

@@ -3,7 +3,7 @@ class Object
     if key.present?
       scope = [:active_scaffold, *options.delete(:scope)]
       options = options.reverse_merge(:scope => scope, :default => key.is_a?(String) ? key : key.to_s.titleize)
-      text = I18n.translate(key.to_s, options).html_safe # rubocop:disable Rails/OutputSafety
+      text = I18n.translate(key.to_s, **options).html_safe # rubocop:disable Rails/OutputSafety
       # text = nil if text.include?('translation missing:')
     end
     text || key

data/lib/active_scaffold/finder.rb

@@ -409,9 +409,9 @@ module ActiveScaffold
       params_hash active_scaffold_embedded_params[:conditions]
     end
 
-    def all_conditions
+    def all_conditions(include_id_condition = true)
       [
-        id_condition,                                 # for list with id (e.g. /users/:id/index)
+        (id_condition if include_id_condition),       # for list with id (e.g. /users/:id/index)
         active_scaffold_conditions,                   # from the search modules
         conditions_for_collection,                    # from the dev
         conditions_from_params,                       # from the parameters (e.g. /users/list?first_name=Fred)
@@ -444,9 +444,11 @@ module ActiveScaffold
     def finder_options(options = {})
       search_conditions = all_conditions
 
+      sorting = options[:sorting]&.clause((grouped_columns_calculations if grouped_search?))
+      sorting = sorting.map(&Arel.method(:sql)) if sorting && active_scaffold_config.active_record?
       # create a general-use options array that's compatible with Rails finders
       finder_options = {
-        :reorder => options[:sorting]&.clause((grouped_columns_calculations if grouped_search?)).map(&Arel.method(:sql)),
+        :reorder => sorting,
         :conditions => search_conditions
       }
       if active_scaffold_config.mongoid?
@@ -519,8 +521,8 @@ module ActiveScaffold
       @last_modified = query.maximum(:updated_at)
     end
 
-    def calculate_query
-      conditions = all_conditions
+    def calculate_query(id_condition = true)
+      conditions = all_conditions(id_condition)
       includes = active_scaffold_config.list.count_includes
       includes ||= active_scaffold_references if conditions.present?
       left_joins = active_scaffold_outer_joins

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -180,6 +180,17 @@ module ActiveScaffold
           end
         end
       end
+
+      def save_record_to_association(record, association, value, reverse = nil)
+        return unless association
+        if association.collection?
+          record.association(association.name).target << value
+        elsif reverse&.belongs_to?
+          value.send("#{reverse.name}=", record)
+        else
+          record.send("#{association.name}=", value)
+        end
+      end
     end
   end
 end

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -71,9 +71,9 @@ module ActiveScaffold
         end
       end
 
-      def active_scaffold_subform_attributes(column, column_css_class = nil)
+      def active_scaffold_subform_attributes(column, column_css_class = nil, klass = nil)
         {
-          :class => "sub-form #{active_scaffold_config_for(column.association.klass).subform.layout}-sub-form #{column_css_class} #{column.name}-sub-form",
+          :class => "sub-form #{active_scaffold_config_for(klass || column.association.klass).subform.layout}-sub-form #{column_css_class} #{column.name}-sub-form",
           :id => sub_form_id(:association => column.name)
         }
       end
@@ -308,17 +308,39 @@ module ActiveScaffold
         html
       end
 
-      def active_scaffold_new_record_subform(column, record, html_options)
-        subform_attrs = active_scaffold_subform_attributes(column).merge(style: 'display: none')
+      def active_scaffold_new_record_subform(column, record, html_options, new_record_attributes: nil, locals: {}, skip_link: false) # rubocop:disable Metrics/ParameterLists
+        klass =
+          if column.association.polymorphic? && column.association.belongs_to?
+            type = record.send(column.association.foreign_type)
+            column.association.klass(record) if type.present? && (column.options[:add_new] == true || type.in?(column.options[:add_new]))
+          else
+            column.association.klass
+          end
+        return content_tag(:div, '') unless klass
+        subform_attrs = active_scaffold_subform_attributes(column, nil, klass)
+        if record.send(column.name)&.new_record?
+          new_record = record.send(column.name)
+        else
+          subform_attrs[:style] = 'display: none'
+        end
+        subform_attrs[:class] << ' optional'
         scope = html_options[:name].scan(/record(.*)\[#{column.name}\]/).dig(0, 0)
-        new_record = build_associated(column.association, record)
-        subform = render(partial: subform_partial_for_column(column), locals: {column: column, parent_record: record, associated: [], show_blank_record: new_record, scope: scope})
+        new_record ||= klass.new(new_record_attributes)
+        locals = locals.reverse_merge(column: column, parent_record: record, associated: [], show_blank_record: new_record, scope: scope)
+        subform = render(partial: subform_partial_for_column(column, klass), locals: locals)
+        if column.options[:hide_subgroups]
+          toggable_id = "#{sub_form_id(association: column.name, id: record.id || generated_id(record) || 99_999_999_999)}-div"
+          subform << link_to_visibility_toggle(toggable_id, default_visible: false)
+        end
         html = content_tag(:div, subform, subform_attrs)
+        return html if skip_link
         html << active_scaffold_show_new_subform_link(column, record, html_options[:id], subform_attrs[:id])
       end
 
       def active_scaffold_show_new_subform_link(column, record, select_id, subform_id)
-        link_to(as_(:create_new), '#', data: {select_id: select_id, subform_id: subform_id, subform_text: as_(:add_existing)}, class: 'show-new-subform')
+        data = {select_id: select_id, subform_id: subform_id, subform_text: as_(:add_existing), select_text: as_(:create_new)}
+        label = data[record.send(column.name)&.new_record? ? :subform_text : :select_text]
+        link_to(label, '#', data: data, class: 'show-new-subform')
       end
 
       def active_scaffold_file_with_remove_link(column, options, content, remove_file_prefix, controls_class, &block) # rubocop:disable Metrics/ParameterLists
@@ -469,20 +491,35 @@ module ActiveScaffold
             active_scaffold_enum_options(column, record)
           end
 
-        selected = record.send(column.association.name)&.id if column.association
+        selected = record.send(column.association.name) if column.association
+        selected_id = selected&.id
         if options.present?
+          if column.options[:add_new]
+            html_options[:data] ||= {}
+            html_options[:data][:subform_id] = active_scaffold_subform_attributes(column)[:id]
+            radio_html_options = html_options.merge(class: html_options[:class] + ' hide-new-subform')
+          else
+            radio_html_options = html_options
+          end
           radios = options.map do |option|
-            active_scaffold_radio_option(option, selected, column, html_options)
+            active_scaffold_radio_option(option, selected_id, column, radio_html_options)
           end
           if column.options[:include_blank]
             label = column.options[:include_blank]
             label = as_(column.options[:include_blank]) if column.options[:include_blank].is_a?(Symbol)
             radios.prepend content_tag(:label, radio_button(:record, column.name, '', html_options.merge(id: nil)) + label)
           end
+          if column.options[:add_new]
+            create_new_button = radio_button_tag(html_options[:name], '', selected&.new_record?, html_options.merge(id: nil, class: html_options[:class] + ' show-new-subform'))
+            radios << content_tag(:label, create_new_button << as_(:create_new)) <<
+              active_scaffold_new_record_subform(column, record, html_options, skip_link: true)
+          end
           safe_join radios
         else
-          content_tag(:span, as_(:no_options), :class => "#{html_options[:class]} no-options", :id => html_options[:id]) <<
-            hidden_field_tag(html_options[:name], '', :id => nil)
+          html = content_tag(:span, as_(:no_options), :class => "#{html_options[:class]} no-options", :id => html_options[:id])
+          html << hidden_field_tag(html_options[:name], '', :id => nil)
+          html << active_scaffold_new_record_subform(column, record, html_options) if column.options[:add_new]
+          html
         end
       end
 
@@ -628,8 +665,8 @@ module ActiveScaffold
       end
       alias override_input? override_input
 
-      def subform_partial_for_column(column)
-        subform_partial = "#{active_scaffold_config_for(column.association.klass).subform.layout}_subform"
+      def subform_partial_for_column(column, klass = nil)
+        subform_partial = "#{column.options[:layout] || active_scaffold_config_for(klass || column.association.klass).subform.layout}_subform"
         override_subform_partial(column, subform_partial) || subform_partial
       end
 
@@ -703,14 +740,14 @@ module ActiveScaffold
 
         # Minimum
         unless options[:min]
-          min = validators.map { |v| v.options[:greater_than_or_equal] }.compact.max
+          min = validators.map { |v| v.options[:greater_than_or_equal_to] }.compact.max
           greater_than = validators.map { |v| v.options[:greater_than] }.compact.max
           numerical_constraints[:min] = [min, (greater_than + margin if greater_than)].compact.max
         end
 
         # Maximum
         unless options[:max]
-          max = validators.map { |v| v.options[:less_than_or_equal] }.compact.min
+          max = validators.map { |v| v.options[:less_than_or_equal_to] }.compact.min
           less_than = validators.map { |v| v.options[:less_than] }.compact.min
           numerical_constraints[:max] = [max, (less_than - margin if less_than)].compact.min
         end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -170,8 +170,12 @@ module ActiveScaffold
 
       def column_association_size(record, column, value)
         cached_counts = @counts&.dig(column.name)
-        key = column.association.primary_key if count_on_association_class?(column)
-        cached_counts ? cached_counts[record.send(key || :id)] || 0 : value.size
+        if cached_counts
+          key = column.association.primary_key if count_on_association_class?(column)
+          cached_counts[record.send(key || :id)] || 0
+        else
+          value.size
+        end
       end
 
       def format_number_value(value, options = {})
@@ -427,16 +431,16 @@ module ActiveScaffold
 
       # CALCULATIONS
 
-      def column_calculation(column)
+      def column_calculation(column, id_condition: true)
         if column.calculate.instance_of? Proc
           column.calculate.call(@records)
         else
-          calculate_query.calculate(column.calculate, column.name)
+          calculate_query(id_condition).calculate(column.calculate, column.name)
         end
       end
 
-      def render_column_calculation(column)
-        calculation = column_calculation(column)
+      def render_column_calculation(column, id_condition: true)
+        calculation = column_calculation(column, id_condition: id_condition)
         override_formatter = "render_#{column.name}_#{column.calculate.is_a?(Proc) ? :calculate : column.calculate}"
         calculation = send(override_formatter, calculation) if respond_to? override_formatter
         format_column_calculation(column, calculation)