active_scaffold 3.6.0.rc1 → 3.6.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c9ea6700cdf564c8c6712df6f538251a00ab77d708a1cb6ddbaf1522f7f3c82
-  data.tar.gz: c71eb0579b0671fedf08104b51237f260b43ff5d6aa090c98a3ffffde943f31d
+  metadata.gz: 482104397cc4bcba59938371add5a7d584a23c3f42aa4b8f3f4ba44f0ffa6114
+  data.tar.gz: a140af6343b7a3002740fa8a5af20ddd5da09a0c7a3f384ef31c85a697918cb4
 SHA512:
-  metadata.gz: dd0cb52f16d6a75545d491388cbde13f99db60cf0c951db73df00ce77dac5fdd09573331b510fcd2e9a2f637c539e754c8fab0838d5709e22fd8abb11128d9ae
-  data.tar.gz: b0b4558cf821b84701e42f730eb6699c49a82e3c1e70a6f570d6dd99abbb599f783dded394b94bd7aa96db89d4cd4a23e848480239d4256a5e3f596812ba4e17
+  metadata.gz: 89556a2bbb6664fb22291e21bba6108d21c0195788cf5e3fdb6b5d471aab24e7bdef1d40d764f68bb9ecb6e94dfc5c728ac4742b3034a7e74d7e11688933d835
+  data.tar.gz: 2606b28e771d97eb6600fb380c34cace3adfbce11cc7baa470de3821dd2bd82e3acec4e66b1bcef14ff7fa17755e2255d7b977a43e85aea893d70d83c2d0f133

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+= 3.6.0.rc2
+- Fix subform crud in subform subgroup when controller is embedded
+- Fix sorting for mongoid models, broken in 3.6.0.rc1
+- Improve add_new option, allow to change subform columns (with helper override calling super and add columns to locals argument)
+- Support add_new option for record_select or radio form_ui
+- Support add_new option for polymorphic associations (add_new may be array with class names to allow add new, or true to allow add new for any model)
+- Support description for columns displayed as subform
+- Don't mess with history if current page is not using activescaffold when is loaded
+- Fix changing sort_by per request when threadsafe is enabled
+
 = 3.6.0.rc1
 - Cleanup: deprecate ActiveScaffold.set_defaults for ActiveScaffold.defaults, rename some setters
 - Fix adding new action links on request with threadsafety enabled

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -323,20 +323,34 @@ jQuery(document).ready(function($) {
     if (jQuery(this).prop('checked')) color_field.val('');
   });
 
-  jQuery(document).on('click', '.show-new-subform', function(e) {
-    e.preventDefault();
+  jQuery(document).on('click', '.hide-new-subform, .show-new-subform', function(e) {
     var $this = jQuery(this), line = $this.closest('.form-element'),
-      select = line.find('#' + $this.data('select-id')),
-      subform = line.find('#' + $this.data('subform-id'));
-    if (select.is(':visible')) {
-      select.hide().prop('disabled', true);
-      subform.show().find("input:disabled,select:disabled,textarea:disabled").prop('disabled', false);
-      $this.data('select-text', $this.html());
-      $this.html($this.data('subform-text'));
+      subform = line.find('#' + $this.data('subform-id')), radio = false, hide, select;
+    if ($this.is('[type=radio]')) {
+      radio = true;
+      hide = $this.is('.hide-new-subform');
     } else {
+      e.preventDefault();
+      hide = subform.is(':visible');
+    }
+    if ($this.data('select-id')) {
+      select = line.find('#' + $this.data('select-id'));
+      if (select.hasClass('recordselect') || select.is('.no-options')) select = select.next(':hidden').andSelf();
+    }
+    if (hide) {
       subform.hide().find("input:enabled,select:enabled,textarea:enabled").prop('disabled', true);
-      select.show().prop('disabled', false);
-      $this.html($this.data('select-text'));
+      if (select) select.show().prop('disabled', false);
+      if (radio) {
+        $this.closest('.form-element').find('[name="' + $this.attr('name') + '"].show-new-subform').prop('disabled', false);
+      } else $this.html($this.data('select-text'));
+    } else {
+      if (select) select.hide().prop('disabled', true);
+      subform.show().find("input:disabled,select:disabled,textarea:disabled").prop('disabled', false);
+      if (radio) $this.prop('disabled', true);
+      else {
+        $this.data('select-text', $this.html());
+        $this.html($this.data('subform-text'));
+      }
     }
   });
 
@@ -500,6 +514,7 @@ var ActiveScaffold = {
     ActiveScaffold.disable_optional_subforms(container);
   },
   setup_history_state: function() {
+    if (!jQuery('.active-scaffold').length) return;
     var data = {}, current_search_item = jQuery('.active-scaffold .filtered-message[data-search]');
     if (current_search_item.length) {
       // store user settings enabled, update state with current page, search and sorting
@@ -536,8 +551,27 @@ var ActiveScaffold = {
     jQuery('.as-js-button', element).show();
   },
   disable_optional_subforms: function(element) {
-    jQuery('.form-element select + .sub-form').each(function() {
-      jQuery("input:enabled,select:enabled,textarea:enabled", this).prop('disabled', true);
+    jQuery('.sub-form.optional', element).each(function () {
+      var $this = jQuery(this), toggle = $this.find('>.visibility-toggle');
+      if (toggle.length) {
+        var hide = toggle.text() == toggle.data('show');
+        $this.find('> [id] > .sub-form-record > .associated-record dl:first').each(function (i) {
+          var parent = jQuery(this).parent(), div_id = toggle.data('toggable') + i;
+          parent.children().wrapAll('<div id="' + div_id + '">');
+          if (hide) parent.find('> div').hide();
+          parent.prepend(toggle.clone().data('toggable', div_id));
+        });
+        toggle.remove();
+      }
+      if ($this.is(':visible')) {
+        var line = $this.closest('.form-element'), toggle = line.find('.show-new-subform[data-subform-id="' + $this.attr('id') + '"]').first();
+        if (toggle.is('[type=radio]')) toggle.prop('disabled', true);
+        else if (toggle.data('select-id')) {
+          select = line.find('#' + toggle.data('select-id'));
+          if (select.hasClass('recordselect') || select.is('.no-options')) select = select.next(':hidden').andSelf();
+          select.hide().prop('disabled', true);
+        }
+      } else $this.find("input:enabled,select:enabled,textarea:enabled").prop('disabled', true);
     });
   },
   sliders: function(element) {

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -841,7 +841,7 @@ clear: left;
 padding: 5px 0;
 padding-left: 5px;
 }
-.active-scaffold .form-element select + .sub-form {
+.active-scaffold .form-element .sub-form.optional {
 float: none;
 }
 .active-scaffold .form-element .show-new-subform {

data/app/views/active_scaffold_overrides/_form_association.html.erb

@@ -13,8 +13,9 @@ footer = render(:partial => 'form_association_footer', :locals => {:parent_recor
 -%>
 <h5>
   <%= column.label -%>
-  <%= link_to_visibility_toggle(subform_div_id, {:default_visible => !column.collapsed}) -%>
+  <%= link_to_visibility_toggle(subform_div_id, default_visible: !column.collapsed) -%>
 </h5>
+<%= content_tag :span, column.description, class: 'description' if column.description.present? %>
 <div id ="<%= subform_div_id %>" <%= 'style="display: none;"'.html_safe if column.collapsed -%>>
 <%# HACK: to be able to delete all associated records %>
   <%= hidden_field_tag "#{(opts = active_scaffold_input_options(column, scope, :object => parent_record))[:name]}[0]", '', :id => "#{opts[:id]}_0" if column.association.collection? %>

data/app/views/active_scaffold_overrides/_form_association_record.html.erb

@@ -6,11 +6,13 @@
   show_actions = false
   locked ||= false
   config = active_scaffold_config_for(record.class)
+  columns ||= config.subform.columns
   scope = column_scope(record_column, scope, record)
   options = active_scaffold_input_options(config.columns[record.class.primary_key], scope, :object => record)
   tr_id = "association-#{options[:id]}"
+  layout ||= config.subform.layout
 
-  if config.subform.layout == :vertical
+  if layout == :vertical
     record_tag ||= :div
     row_tag ||= :ol
     column_tag ||= :li
@@ -40,7 +42,7 @@
   <% end %>
   <% end %>
   <%= content_tag row_tag, :id => tr_id, :class => "association-record#{' association-record-new' if record.new_record?}#{' locked' if locked}" do %>
-  <% config.subform.columns.each_column(for: record.class, crud_type: :read, flatten: flatten) do |column| %>
+  <% columns.each_column(for: record.class, crud_type: :read, flatten: flatten) do |column| %>
   <%
     if column.respond_to? :each_column
       columns_groups << column

data/app/views/active_scaffold_overrides/_horizontal_subform.html.erb

@@ -2,10 +2,10 @@
 <%
   header_record_class = (show_blank_record && show_blank_record.class) || column.association.klass
 -%>
-  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record_class => header_record_class, :parent_column => column} %>
+  <%= render partial: 'horizontal_subform_header', :locals => {parent_record: parent_record, record_class: header_record_class, parent_column: column, columns: local_assigns[:columns]} %>
 
-  <%= render :partial => 'form_association_record', :collection => associated, :locals => {:scope => scope, :parent_record => parent_record, :column => column} %>
-  <%= render :partial => 'form_association_record', :object => show_blank_record, :locals => {:scope => scope, :parent_record => parent_record, :column => column, :locked => true, :index => associated.size} if show_blank_record %>
+  <%= render partial: 'form_association_record', collection: associated, locals: {scope: scope, parent_record: parent_record, column: column, columns: local_assigns[:columns], layout: :horizontal} %>
+  <%= render partial: 'form_association_record', object: show_blank_record, locals: {scope: scope, parent_record: parent_record, column: column, columns: local_assigns[:columns], layout: :horizontal, locked: true, index: associated.size} if show_blank_record %>
   <tfoot>
     <%= render :partial => 'horizontal_subform_footer', :locals => {:scope => scope, :parent_record => parent_record, :column => column} %>
   </tfoot>

data/app/views/active_scaffold_overrides/_horizontal_subform_header.html.erb

@@ -1,7 +1,8 @@
 <thead>
   <tr>
     <%
-    active_scaffold_config_for(record_class).subform.columns.each_column(for: record_class, crud_type: :read) do |column|
+    columns ||= active_scaffold_config_for(record_class).subform.columns
+    columns.each_column(for: record_class, crud_type: :read) do |column|
       next unless column.is_a? ActiveScaffold::DataStructures::Column
       next unless in_subform?(column, parent_record, parent_column)
       hidden = column_renders_as(column) == :hidden

data/app/views/active_scaffold_overrides/_vertical_subform.html.erb

@@ -1,4 +1,4 @@
 <div id="<%= sub_form_list_id(:association => column.name, :id => parent_record.id || generated_id(parent_record) || 99999999999) %>">
-  <%= render :partial => 'form_association_record', :collection => associated, :locals => {:scope => scope, :parent_record => parent_record, :column => column} %>
-  <%= render :partial => 'form_association_record', :object => show_blank_record, :locals => {:scope => scope, :parent_record => parent_record, :column => column, :locked => true, :index => associated.size} if show_blank_record %>
+  <%= render partial: 'form_association_record', collection: associated, locals: {scope: scope, parent_record: parent_record, column: column, columns: local_assigns[:columns], layout: :vertical} %>
+  <%= render partial: 'form_association_record', object: show_blank_record, locals: {scope: scope, parent_record: parent_record, column: column, columns: local_assigns[:columns], layout: :vertical, locked: true, index: associated.size} if show_blank_record %>
 </div>

data/app/views/active_scaffold_overrides/update_column.js.erb

@@ -22,5 +22,5 @@
   ActiveScaffold.replace_html('<%= @column_span_id %>','<%= escape_javascript(get_column_value(@record, @column)) %>');
 <% end -%>
 <% if @column.calculation? -%>
-  ActiveScaffold.replace_html('<%= active_scaffold_calculations_id(:column => @column) %>', '<%= escape_javascript(render_column_calculation(@column)) %>');
+  ActiveScaffold.replace_html('<%= active_scaffold_calculations_id(:column => @column) %>', '<%= escape_javascript(render_column_calculation(@column, id_condition: false)) %>');
 <% end -%>

data/lib/active_scaffold/actions/core.rb

@@ -72,7 +72,8 @@ module ActiveScaffold::Actions
         else
           updated_record_with_column(@column, params.delete(:value), @scope)
         end
-      setup_parent(@record) if main_form_controller && @scope
+      # if @scope has more than 2 ] then it's subform inside subform, and assign parent would fail (found associotion may be through association)
+      setup_parent(@record) if main_form_controller && @scope && @scope.scan(']').size == 2
       after_render_field(@record, @column)
     end
 
@@ -277,7 +278,9 @@ module ActiveScaffold::Actions
 
     def new_model
       relation = beginning_of_chain
-      build_options = sti_nested_build_options(relation.klass) if nested? && nested.plural_association?
+      if nested? && nested.plural_association? && nested.match_model?(active_scaffold_config.model)
+        build_options = sti_nested_build_options(relation.klass)
+      end
       relation.respond_to?(:build) ? relation.build(build_options || {}) : relation.new
     end
 

data/lib/active_scaffold/actions/nested.rb

@@ -90,7 +90,7 @@ module ActiveScaffold::Actions
 
     def beginning_of_chain
       # only if nested is related to current controller, e.g. not when adding record in subform inside subform
-      if nested? && nested.association && nested.association.klass == active_scaffold_config.model
+      if nested? && nested.match_model?(active_scaffold_config.model)
         nested_chain_with_association
       elsif nested? && nested.scope
         nested_parent_record.send(nested.scope)

data/lib/active_scaffold/actions/subform.rb

@@ -9,19 +9,25 @@ module ActiveScaffold::Actions
 
     protected
 
-    def do_edit_associated
-      @parent_record = params[:id].nil? ? new_model : find_if_allowed(params[:id], :update)
-      if @parent_record.new_record?
-        apply_constraints_to_record @parent_record
-        create_association_with_parent @parent_record if nested?
+    def new_parent_record
+      parent_record = new_model
+      # don't apply if scope, subform inside subform, because constraints won't apply to parent_record
+      apply_constraints_to_record parent_record unless @scope
+      if nested? && nested.match_model?(active_scaffold_config.model)
+        create_association_with_parent parent_record
       end
+      parent_record
+    end
+
+    def do_edit_associated
+      @scope = params[:scope]
+      @parent_record = params[:id].nil? ? new_parent_record : find_if_allowed(params[:id], :update)
 
       cache_generated_id(@parent_record, params[:generated_id]) if @parent_record.new_record?
       @column = active_scaffold_config.columns[params[:child_association]]
 
       @record = find_associated_record if params[:associated_id]
       @record ||= build_associated(@column.association, @parent_record)
-      @scope = params[:scope]
     end
 
     def find_associated_record

data/lib/active_scaffold/attribute_params.rb

@@ -230,7 +230,7 @@ module ActiveScaffold
       return nil unless build_record_from_params?(attributes, column, parent_record)
       record = find_or_create_for_params(attributes, column, parent_record)
       if record
-        record_columns = active_scaffold_config_for(column.association.klass).subform.columns
+        record_columns = active_scaffold_config_for(record.class).subform.columns
         prev_constraints = record_columns.constraint_columns
         record_columns.constraint_columns = [column.association.reverse].compact
         update_record_from_params(record, record_columns, attributes, avoid_changes)
@@ -242,8 +242,9 @@ module ActiveScaffold
 
     def build_record_from_params?(params, column, record)
       current = record.send(column.name)
-      klass = column.association.klass
-      (column.association.collection? && !column.show_blank_record?(current)) || !attributes_hash_is_empty?(params, klass)
+      return true if column.association.collection? && !column.show_blank_record?(current)
+      klass = column.association.klass(record)
+      klass && !attributes_hash_is_empty?(params, klass)
     end
 
     # Attempts to create or find an instance of the klass of the association in parent_column from the
@@ -251,12 +252,12 @@ module ActiveScaffold
     # otherwise it will build a new one.
     def find_or_create_for_params(params, parent_column, parent_record)
       current = parent_record.send(parent_column.name)
-      klass = parent_column.association.klass
+      klass = parent_column.association.klass(parent_record)
       if params.key? klass.primary_key
         record_from_current_or_find(klass, params[klass.primary_key], current)
       elsif klass.authorized_for?(:crud_type => :create)
         association = parent_column.association
-        record = association.klass.new
+        record = klass.new
         if association.reverse_association&.belongs_to? && (association.collection? || current.nil?)
           record.send("#{parent_column.association.reverse}=", parent_record)
         end
@@ -278,17 +279,6 @@ module ActiveScaffold
       end
     end
 
-    def save_record_to_association(record, association, value, reverse = nil)
-      return unless association
-      if association.collection?
-        record.send(association.name) << value
-      elsif reverse&.belongs_to?
-        value.send("#{reverse.name}=", record)
-      else
-        record.send("#{association.name}=", value)
-      end
-    end
-
     # Determines whether the given attributes hash is "empty".
     # This isn't a literal emptiness - it's an attempt to discern whether the user intended it to be empty or not.
     def attributes_hash_is_empty?(hash, klass)

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

@@ -24,6 +24,7 @@ module ActiveScaffold
           columns << field
           columns.exclude "#{field}_attachment#{'s' if field_type == :has_many}".to_sym
           columns.exclude "#{field}_blob#{'s' if field_type == :has_many}".to_sym
+          columns[field].includes ||= ["#{field}_attachment#{'s' if field_type == :has_many}".to_sym, "#{field}_blob#{'s' if field_type == :has_many}".to_sym]
           columns[field].form_ui ||= "active_storage_#{field_type}".to_sym
           columns[field].params.add "delete_#{field}"
         end

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

@@ -3,7 +3,7 @@ module ActiveScaffold
     module ListColumnHelpers
       def active_scaffold_column_active_storage_has_one(record, column)
         attachment = record.send(column.name.to_s)
-        attachment.attached? ? link_for_attachment(attachment) : nil
+        attachment.attached? ? link_for_attachment(attachment, column) : nil
       end
 
       def active_scaffold_column_active_storage_has_many(record, column)
@@ -12,7 +12,7 @@ module ActiveScaffold
 
         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) }
+          links = attachments.map { |attachment| link_for_attachment(attachment, column) }
           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)
+      def link_for_attachment(attachment, column)
         variant = column.options[:thumb] || ActiveScaffold::Bridges::ActiveStorage::ActiveStorageBridgeHelpers.thumbnail_variant
         content =
-          if variant && attachment.variable?
+          if variant && attachment.variable? && column.options[:thumb] != false
             image_tag(attachment.variant(variant))
           else
             attachment.filename

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/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

data/lib/active_scaffold/extensions/cow_proxy.rb

@@ -18,6 +18,10 @@ module CowProxy
           end
           super
         end
+
+        def sort_by(options)
+          @sort = options
+        end
       end
 
       class Set < ::CowProxy::WrapClass(::ActiveScaffold::DataStructures::Set)

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
 

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -427,16 +427,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)

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 6
-    PATCH = '0.rc1'.freeze
+    PATCH = '0.rc2'.freeze
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.6.0.rc1
+  version: 3.6.0.rc2
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails