active_scaffold 4.1.6 → 4.2.0

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

@@ -10,7 +10,7 @@
     end
   end
   disable_required_for_new = @disable_required_for_new
-  @disable_required_for_new = !show_blank_record.nil? unless column.association.singular? && column.required?(action_for_validation?(parent_record))
+  @disable_required_for_new = !show_blank_record.nil? unless column.association.singular? && column.required?(action_for_validation(parent_record))
   subform_div_id = "#{sub_form_id(association: column.name, tab_id: tab_id, id: parent_record.id || generated_id(parent_record) || 99_999_999_999)}-div"
 
   # render footer before rendering associated records, fixes create new on self-associations

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

@@ -25,7 +25,7 @@
     column_tag ||= :td
     error_tag ||= :tr
     error_inner_tag ||= :td
-    default_col_class = []
+    default_col_class = ['form-element']
     flatten ||= false
   end
   index ||= form_association_record_counter ||= nil
@@ -52,8 +52,8 @@
     columns_length += 1
     show_actions = true
 
-    col_class = default_col_class.clone
-    col_class << 'required' if column.required?(action_for_validation?(record))
+    col_class = default_col_class.dup
+    col_class << 'required' if column.required?(action_for_validation(record))
     col_class << column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc)
     col_class << 'hidden' if column_renders_as(column) == :hidden
   -%>
@@ -63,13 +63,7 @@
   <% end -%>
   <% if show_actions -%>
     <%= content_tag column_tag, class: 'actions' do %>
-      <% if record_column.association.collection? && !locked %>
-        <%
-          auth = %i[destroy delete_all delete].exclude?(record_column.association.dependent)
-          auth, reason = record.authorized_for?(crud_type: :delete, reason: true) unless auth
-        %>
-        <%= auth ? link_to(as_(:remove), '#', class: 'destroy', id: "#{options[:id]}-destroy", data: {delete_id: tr_id}) : reason %>
-      <% end %>
+      <%= active_scaffold_subform_record_actions(record_column, record, locked, scope) %>
       <% unless record.new_record? %>
         <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= record.id -%>" />
       <% end -%>
@@ -83,7 +77,7 @@
       <% columns_group.each_column(for: record.class, crud_type: :read, flatten: true) do |col| %>
         <%
           col_class = default_col_class.clone
-          col_class << 'required' if col.required?(action_for_validation?(record))
+          col_class << 'required' if col.required?(action_for_validation(record))
           col_class << col.css_class unless col.css_class.nil? || col.css_class.is_a?(Proc)
           col_class << 'hidden' if column_renders_as(col) == :hidden
         %>

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

@@ -3,7 +3,7 @@
   header_record_class = show_blank_record&.class || column.association.klass
   record_partial_locals = {scope: scope, parent_record: parent_record, column: column, columns: local_assigns[:columns], layout: :horizontal}
 -%>
-  <%= render 'horizontal_subform_header', parent_record: parent_record, record_class: header_record_class, parent_column: column, columns: local_assigns[:columns] %>
+  <%= render 'horizontal_subform_header', parent_record: parent_record, record_class: header_record_class, parent_column: column, columns: local_assigns[:columns], scope: scope %>
 
   <%= render partial: 'form_association_record', collection: associated, as: :record, locals: record_partial_locals %>
   <%= render 'form_association_record', record_partial_locals.merge(locked: true, index: associated.size, record: show_blank_record) if show_blank_record %>

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

@@ -9,9 +9,7 @@
       -%>
       <th class="<%= "#{column.name}-column #{'required' if column.required?} #{'hidden' if hidden}" %>">
         <label><%= subform_label(column, hidden) %></label>
-        <% if column.description.present? -%>
-          <span class="description"><%= column.description %></span>
-        <% end -%>
+        <%= column_description(column, nil, scope) %>
       </th>
     <% end -%>
     <th></th>

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

@@ -8,7 +8,9 @@
   <% end %>
 <% elsif active_scaffold_config.create.refresh_list %>
   <%= render 'refresh_list', no_history: true %>
-<% elsif params[:parent_controller].nil? %>
+<% elsif params[:parent_controller].present? %>
+  if (action_link) action_link.refresh();
+<% else %>
   <% new_row = render list_record_view, record: @saved_record || @record %>
   ActiveScaffold.create_record_row(action_link ? action_link.scaffold() : '<%= active_scaffold_id %>', '<%= escape_javascript(new_row) %>', <%= {insert_at: insert_at}.to_json.html_safe %>);
   <%= render 'update_calculations' %>

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

@@ -19,6 +19,6 @@
 
 <% if !@auto_pagination && !@popstate && !embedded? && !local_assigns[:no_history] -%>
   if (!jQuery('#<%= active_scaffold_id %>').is('.active-scaffold .active-scaffold')) {
-    ActiveScaffold.add_to_history(<%=raw request.original_url.to_json %>, <%=raw history_state.to_json %>);
+    ActiveScaffold.add_to_history(<%=raw (local_assigns[:history_url] || request.original_url).to_json %>, <%=raw history_state.to_json %>);
   }
 <% end -%>

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

@@ -1,44 +1,75 @@
 <%
-  column =
-    if render_field.is_a? ActiveScaffold::DataStructures::Column
-      render_field
-    else
-      active_scaffold_config.columns[render_field]
-    end
-  return unless @main_columns.include? column.name
-  @rendered ||= Set.new
-  return if @rendered.include? column.name
-  @rendered << column.name
-  if @form_action == :field_search
-    form_ui = column.search_ui
-  else
-    renders_as = column_renders_as(column)
-    form_ui = column.form_ui
-  end
+  record ||= @record
+  active_scaffold_config ||= self.active_scaffold_config
+  if render_field.is_a?(Hash)
+    traverse ||= []
+    render_field.each do |assoc_name, columns|
+      if assoc_name == :__root__
+        config = params[:parent_controller] ? active_scaffold_config_for(params[:parent_controller].singularize.camelize) : controller.active_scaffold_config
+        value = @form_record
+      else
+        next if traverse.blank? && @main_columns.exclude?(assoc_name)
+        assoc_column = active_scaffold_config.columns[assoc_name]
+        raise "#{assoc_name} is not an association column" unless assoc_column&.association
+        config =  active_scaffold_config_for(assoc_column.association.klass)
+        value = record.send(assoc_name)
+        traverse_by_record = assoc_column.association.collection?
+      end
+      next if value.nil?
 
-  column_css_class = column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc)
-  options = {field_class: "#{column.name}-input", hidden: form_ui == :hidden}
-  options[:subform_class] = "#{column.name}-sub-form" if column.association
-  options[:attrs] =
-    if renders_as == :subform
-      active_scaffold_subform_attributes(column, column_css_class)
-    else
-      {class: "form-element #{:required if column.required?(@form_action)} #{column.form_ui} #{column_css_class}", id: ''}
+      columns = [columns] unless columns.is_a?(Array)
+      sub_form = assoc_name == :__root__ ? assoc_name : ".#{assoc_name}-sub-form .sub-form-record"
+      Array(value).each do |r|
+        temp_id = @new_records&.dig(config.model)&.key(r) if traverse_by_record && r.id.nil?
+        step = traverse_by_record ? "#{sub_form}:has([id$=\"#{assoc_name}_#{r.id || temp_id}\"])" : sub_form
+        next_scope = column_scope(assoc_column, scope, r, temp_id) unless assoc_name == :__root__
+%>
+<%= render(partial: 'render_field', collection: columns, locals: {source_id: source_id, scope: next_scope, record: r, active_scaffold_config: config, traverse: traverse + [step]}) %>
+<%
+      end
     end
-  html =
-    if scope
-      readonly = @record.readonly? || !@record.authorized_for?(crud_type: :update)
-      crud_type = @record.id.nil? ? :create : (readonly ? :read : :update) # don't use new_record?, it's always true in render_field action
-      # subform.columns.to_a.include? so it doesn't check inside subgroups
-      active_scaffold_render_subform_column(column, scope, crud_type, readonly, active_scaffold_config.subform.columns.to_a.exclude?(column.name), @record)
-    elsif @form_action == :field_search
-      search_attribute(column, @record)
+  else
+    column =
+      if render_field.is_a? ActiveScaffold::DataStructures::Column
+        render_field
+      else
+        active_scaffold_config.columns[render_field]
+      end
+    return if column.nil? # using hash may include __root__ to update parent columns when used as subform, and fail if it can be in different model's form, or when edited without subform
+    return if local_assigns[:traverse].nil? && @main_columns.exclude?(column.name)
+    rendered = (@rendered ||= {})[record] ||= Set.new
+    return if rendered.include? column.name
+    rendered << column.name
+    if @form_action == :field_search
+      form_ui = column.search_ui
     else
-      render_column(column, @record, renders_as, scope)
+      renders_as = column_renders_as(column)
+      form_ui = column.form_ui
     end
+
+    column_css_class = column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc)
+    options = {field_class: "#{column.name}-input", hidden: form_ui == :hidden}
+    options[:subform_class] = "#{column.name}-sub-form" if column.association
+    options[:attrs] =
+      if renders_as == :subform
+        active_scaffold_subform_attributes(column, column_css_class)
+      else
+        {class: "form-element #{:required if column.required?(@form_action)} #{column.form_ui} #{column_css_class}", id: ''}
+      end
+    options[:traverse] = traverse if local_assigns[:traverse]
+    html =
+      if scope
+        readonly = record.readonly? || !record.authorized_for?(crud_type: :update)
+        crud_type = record.id.nil? ? :create : (readonly ? :read : :update) # don't use new_record?, it's always true in render_field action
+        # subform.columns.to_a.include? so it doesn't check inside subgroups
+        active_scaffold_render_subform_column(column, scope, crud_type, readonly, active_scaffold_config.subform.columns.to_a.exclude?(column.name), record)
+      elsif @form_action == :field_search
+        search_attribute(column, record)
+      else
+        render_column(column, record, renders_as, scope)
+      end
 -%>
 
 ActiveScaffold.render_form_field('<%= source_id %>','<%= escape_javascript(html) %>', <%= options.to_json.html_safe %>);
-<%if column.update_columns.present?%>
-<%= render(partial: 'render_field', collection: column.update_columns, locals: {source_id: source_id, scope: scope}) %>
-<%end%>
+<%= render(partial: 'render_field', collection: column.update_columns, locals: local_assigns) if column.update_columns.present? %>
+<% end %>

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

@@ -7,14 +7,49 @@ var field = jQuery('#<%= params[:from_field] %>');
   field_options[:class] = "#{field_options[:class]} update_form" if field_options&.dig('data-update_url')
 %>
 if (field.is('select')) {
-  field.append('<%= j content_tag(:option, label, value: id) %>');
-  field.val(<%= id %>);
+  if (!field.find('option[value="<%= id %>"]').length) field.append('<%= j content_tag(:option, label, value: id) %>');
+  if (field.prop("multiple")) {
+    var current = field.val() || [];  // val() returns null if nothing selected
+    current.push(<%= id %>);
+    field.val(current);
+  } else {
+    field.val(<%= id %>);
+  }
+  if (field.is('.chosen')) field.trigger('chosen:updated');
 } else if (field.is('input.recordselect')) {
-  field.val('<%= j label %>').addClass('selected');
-  field.next().val(<%= id %>);
+  var rs = field.siblings('.record-select-list').data('recordselect');
+  if (rs) { // RS multiple
+    rs.add(<%= id %>, '<%= j label %>');
+  } else {
+    field.val('<%= j label %>').addClass('selected');
+    field.next().val(<%= id %>);
+  }
 } else if (field.is('.new-radio-container')) {
-  field.append('<%= j active_scaffold_radio_option(@record, id, column, field_options, ui_options: column.form_ui_options || column.options) if column %>');
+  if (!field.parent().find('input[type=radio][value="<%= id %>"]').length) {
+    field.append('<%= j active_scaffold_radio_option(@record, id, column, field_options, ui_options: column.form_ui_options || column.options) if column %>');
+  } else field = field.parent().find('input[type=radio][value="<%= id %>"]').prop('checked', true);
+} else if (field.is('.checkbox-list')) {
+  var list = field;
+  if (list.is('.draggable-list')) {
+    field = field.closest('.draggable-lists-container');
+    list = field.find('.draggable-list.selected');
+  }
+  if (!field.find('input[type=checkbox][value="<%= id %>"]').length) {
+    <%
+      ui_options = column&.form_ui_options || column&.options
+      label_method = ui_options&.dig(:label_method) || :to_label
+      cb_id = "#{field_options[:id]}_INDEX_id"
+      html = active_scaffold_checkbox_option(@record, label_method, [id], {name: "#{field_options[:name]}[]", id: cb_id}, ui_options&.dig(:item_options) || {})
+    %>
+    var cb_id = '<%= cb_id %>'.replace('INDEX', field.find('input[type=checkbox]').length);
+    list.append('<%= j html %>')
+    list.find('#<%= cb_id %>').attr('id', cb_id);
+    list.find('[for="<%= cb_id %>"]').attr('for', cb_id);
+  } else {
+    field = field.find('input[type=checkbox][value="<%= id %>"]').prop('checked', true);
+    if (list.is('.draggable-list')) list.append(field.parent());
+  }
 }
 field.trigger('change');
-var action_link = ActiveScaffold.ActionLink.get(field.parent().find('a.as_action'));
+var action_link = ActiveScaffold.ActionLink.get(field.closest('.select-field').parent().find('a.as_action'));
 if (action_link) action_link.close();

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

@@ -0,0 +1 @@
+<%= display_dynamic_action_group(@action_links, display_action_links(@action_links, @record, for: @record, output: []).compact, @record) %>

data/config/locales/de.yml

@@ -11,6 +11,9 @@ de:
     add: Hinzufügen
     add_existing: Existierenden Eintrag hinzufügen
     add_existing_model: Existierende %{model} hinzufügen
+    add_model: "%{model} hinzufügen"
+    all_tokens:
+    any_token:
     apply: Akzeptieren
     are_you_sure_to_delete: Sind Sie sicher?
     average: Durchschnitt
@@ -77,6 +80,7 @@ de:
     internal_error: Fehler bei der Verarbeitung
     live_search: Live-Suche
     loading: Lade…
+    logical_search:
     mark_all_records: Alle auswählen
     maximum: Maximum
     minimum: Minimum
@@ -151,3 +155,8 @@ de:
   time:
     formats:
       picker: "%d.%m.%Y %H:%M"
+  datetime:
+    prompts:
+      millisec:
+      microsec:
+

data/config/locales/en.yml

@@ -11,6 +11,9 @@ en:
     add: Add
     add_existing: Add Existing
     add_existing_model: Add Existing %{model}
+    add_model: Add %{model}
+    all_tokens: All keywords
+    any_token: Any keyword
     apply: Apply
     are_you_sure_to_delete: Are you sure you want to delete %{label}?
     average: Average
@@ -77,6 +80,7 @@ en:
     internal_error: Request Failed
     live_search: Live Search
     loading: Loading…
+    logical_search: Logical Search
     mark_all_records: Mark all
     maximum: Maximum
     minimum: Minimum
@@ -151,3 +155,10 @@ en:
   time:
     formats:
       picker: "%a, %d %b %Y %H:%M:%S"
+  datetime:
+    prompts:
+      hour: Hour
+      minute: Minute
+      second: Second
+      millisec: Millisecond
+      microsec: Microsecond

data/config/locales/es.yml

@@ -11,6 +11,9 @@ es:
     add: Añadir
     add_existing: Añadir Existente
     add_existing_model: Añadir %{model} Existente
+    add_model: Añadir %{model}
+    all_tokens:
+    any_token:
     apply: Aplicar
     are_you_sure_to_delete: "¿Estás seguro de que quieres borrar %{label}?"
     average: Media
@@ -79,6 +82,7 @@ es:
     internal_error: Petición fallida
     live_search: Buscar en Vivo
     loading: Cargando…
+    logical_search: Búsqueda Logica
     mark_all_records: Seleccionar todos
     maximum: Máximo
     minimum: Mínimo
@@ -153,3 +157,7 @@ es:
   time:
     formats:
       picker: "%a, %d %b %Y %H:%M:%S"
+  datetime:
+    prompts:
+      millisec: Milisegundo
+      microsec: Microsegundo

data/config/locales/fr.yml

@@ -11,6 +11,9 @@ fr:
     add: Ajouter
     add_existing: Ajouter un(e) existant(e)
     add_existing_model: Ajouter un(e) %{model} existant(e)
+    add_model: Ajouter un(e) %{model}
+    all_tokens:
+    any_token:
     apply: Appliquer
     are_you_sure_to_delete: Êtes vous sûr de vouloir supprimer %{label} ?
     average: Moyenne
@@ -77,6 +80,7 @@ fr:
     internal_error: Erreur de la requête
     live_search: Recherche en temps réel
     loading: Chargement…
+    logical_search:
     mark_all_records: Marquer tous
     maximum: Maximum
     minimum: Minimum
@@ -151,3 +155,7 @@ fr:
   time:
     formats:
       picker: "%a, %d %b %Y %H:%M:%S"
+  datetime:
+    prompts:
+      millisec:
+      microsec:

data/config/locales/hu.yml

@@ -11,6 +11,9 @@ hu:
     add: Hozzáadás
     add_existing: Meglevő hozzáadása
     add_existing_model: Meglevő %{model} hozzáadása
+    add_model: "%{model} hozzáadása"
+    all_tokens:
+    any_token:
     apply: Apply
     are_you_sure_to_delete: Are you sure you want to delete %{label}?
     average: Average
@@ -77,6 +80,7 @@ hu:
     internal_error: A lekérés sikertelen
     live_search: Élő keresés
     loading: Betöltés…
+    logical_search:
     mark_all_records: Mark all
     maximum: Maximum
     minimum: Minimum
@@ -151,3 +155,7 @@ hu:
   time:
     formats:
       picker: "%a, %d %b %Y %H:%M:%S"
+  datetime:
+    prompts:
+      millisec:
+      microsec:

data/config/locales/ja.yml

@@ -11,6 +11,9 @@ ja:
     add: 追加
     add_existing: 既存のものを追加
     add_existing_model: 既存の%{model}を追加
+    add_model: "%{model}を追加"
+    all_tokens:
+    any_token:
     apply: 適用
     are_you_sure_to_delete: "%{label}を消去してもよろしいですか？"
     average: 平均
@@ -77,6 +80,7 @@ ja:
     internal_error: リクエストが失敗しました
     live_search: その場で検索
     loading: 読み込み中…
+    logical_search:
     mark_all_records: すべて選択
     maximum: 最大値
     minimum: 最小値
@@ -151,3 +155,7 @@ ja:
   time:
     formats:
       picker: "%Y年%m月%d日（%a） %H:%M:%S"
+  datetime:
+    prompts:
+      millisec:
+      microsec:

data/config/locales/ru.yml

@@ -11,6 +11,9 @@ ru:
     add: Добавить запись
     add_existing: Добавить существующую запись
     add_existing_model: "%{model}: добавить существующую запись"
+    add_model: "%{model}: добавить запись"
+    all_tokens: Todas las palabras
+    any_token: Cualquier palabra
     apply: Применить
     are_you_sure_to_delete: Удалить %{label}?
     average: Среднее
@@ -83,6 +86,7 @@ ru:
     internal_error: Внутренняя ошибка
     live_search: Поиск
     loading: Загрузка…
+    logical_search:
     mark_all_records: Отметить все
     maximum: Максимум
     minimum: Минимум
@@ -159,3 +163,7 @@ ru:
   time:
     formats:
       picker: "%a, %d %b %Y %H:%M:%S"
+  datetime:
+    prompts:
+      millisec:
+      microsec:

data/lib/active_scaffold/actions/common_search.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold::Actions
   module CommonSearch
     def self.included(base)

data/lib/active_scaffold/actions/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold::Actions
   module Core
     def self.included(base)
@@ -107,23 +109,21 @@ module ActiveScaffold::Actions
         id = params[:id]
       end
 
-      # check permissions and support overriding to_param
-      saved_record = find_if_allowed(id, :read) if id
-      # call update_record_from_params with new_model
-      # in other case some associations can be saved
-      record = new_model
-      copy_attributes(saved_record, record) if saved_record
-      apply_constraints_to_record(record) unless scope
-      create_association_with_parent record, check_match: true if nested?
+      # call update_record_from_params with new_model, in other case some associations can be saved
+      @form_record = new_model
+      # check permissions and support overriding to_param, preload associations
+      copy_data_from_saved_record(id, active_scaffold_config, @form_record) if id
+      apply_constraints_to_record(@form_record) unless scope
+      create_association_with_parent @form_record, check_match: true if nested?
       if @form_action == :field_search
-        update_columns_from_params(record, columns, attributes || {}, :read, avoid_changes: true, search_attributes: true)
+        update_columns_from_params(@form_record, columns, attributes || {}, :read, avoid_changes: true, search_attributes: true)
       else
-        update_record_from_params(record, columns, attributes || {}, true)
+        update_record_from_params(@form_record, columns, attributes || {}, true)
       end
     end
 
     def updated_record_with_column(column, value, scope)
-      record = params[:id] ? copy_attributes(find_if_allowed(params[:id], :read)) : new_model
+      record = params[:id] ? copy_data_from_saved_record(params[:id]) : new_model
       apply_constraints_to_record(record) unless scope || params[:id]
       create_association_with_parent record, check_match: true if nested?
       if @form_action == :field_search && value.is_a?(Array) && column.association&.singular?
@@ -148,10 +148,8 @@ module ActiveScaffold::Actions
 
     def setup_parent
       cfg = main_form_controller.active_scaffold_config
-      parent_model = cfg.model
-      parent = parent_model.new
-      copy_attributes(find_if_allowed(params[:parent_id], :read, parent_model), parent) if params[:parent_id]
-      parent.id = params[:parent_id]
+      parent = cfg.model.new
+      copy_data_from_saved_record(params[:parent_id], cfg, parent) if params[:parent_id]
       apply_constraints_to_record(parent) unless params[:parent_id]
       if @column.send_form_on_update_column
         parent = update_record_from_params(parent, cfg.send(params[:parent_id] ? :update : :create).columns, params[:record], true)
@@ -163,7 +161,13 @@ module ActiveScaffold::Actions
           apply_constraints_to_record(parent, constraints: {nested.child_association.name => nested.parent_id})
         end
       end
-      parent
+      @form_record = parent
+    end
+
+    def copy_data_from_saved_record(id, config = active_scaffold_config, record = nil)
+      preload_values = preload_for_form(config.update.columns) if config.actions.include?(:update)
+      saved_record = find_if_allowed(id, :read, config.model.preload(preload_values))
+      copy_attributes(saved_record, record).tap { |new_record| new_record.id = id }
     end
 
     def find_from_scope(parent, scope)
@@ -190,6 +194,9 @@ module ActiveScaffold::Actions
     def copy_attributes(orig, dst = nil)
       dst ||= orig.class.new
       orig.attributes.each { |attr, value| dst.send :write_attribute, attr, value }
+      orig.class.reflect_on_all_associations.each do |assoc|
+        dst.association(assoc.name).target = orig.association(assoc.name).target if orig.send(:association_cached?, assoc.name)
+      end
       dst.changes_applied
       dst
     end
@@ -204,6 +211,27 @@ module ActiveScaffold::Actions
       @parent_sti_controller
     end
 
+    def preload_for_form(columns, preloaded_models = [])
+      association_columns = []
+      columns.each_column(flatten: true, skip_authorization: true) do |column|
+        association_columns << column if column.association && column.subform_includes
+      end
+
+      association_columns.filter_map do |column|
+        if column.form_ui.nil? && column.subform_includes == true && preloaded_models.exclude?(column.association.klass)
+          config = active_scaffold_config_for(column.association.klass)
+          if config.actions.include?(:subform)
+            preload_values = preload_for_form(config.subform.columns, preloaded_models + [column.association.klass])
+          end
+          preload_values ? {column.name => preload_values} : column.name
+        elsif column.subform_includes != true
+          {column.name => column.subform_includes}
+        else
+          column.name
+        end
+      end
+    end
+
     # override this method if you want to do something after render_field
     def after_render_field(record, column); end
 
@@ -273,11 +301,7 @@ module ActiveScaffold::Actions
     # Success is the existence of one or more model objects. Most actions
     # circumvent this method by setting @success directly.
     def successful?
-      if @successful.nil?
-        true
-      else
-        @successful
-      end
+      @successful.nil? || @successful
     end
 
     def successful=(val)
@@ -524,11 +548,11 @@ module ActiveScaffold::Actions
 
     private
 
-    def respond_to_action(action)
+    def respond_to_action(action, formats = action_formats)
       return unless !conditional_get_support? || view_stale?
 
       respond_to do |type|
-        action_formats.each do |format|
+        formats.each do |format|
           type.send(format) do
             method_name = respond_method_for(action, format)
             send(method_name) if method_name

data/lib/active_scaffold/actions/create.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold::Actions
   module Create
     def self.included(base)

data/lib/active_scaffold/actions/delete.rb

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+
 module ActiveScaffold::Actions
   module Delete
     def self.included(base)
+      if base.active_scaffold_config.model.primary_key.nil?
+        raise "#{base.active_scaffold_config.model.name} has no primary key, delete won't work"
+      end
+
       base.before_action :delete_authorized_filter, only: [:destroy]
     end