active_scaffold 3.7.12 → 4.0.0.rc1

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

@@ -27,10 +27,10 @@
     end
   html =
     if scope
-      readonly = @record.readonly? || !@record.authorized_for?(:crud_type => :update)
+      readonly = @record.readonly? || !@record.authorized_for?(crud_type: :update)
       crud_type = @record.new_record? ? :create : (readonly ? :read : :update)
       # 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.include?(column.name), @record)
+      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
@@ -39,6 +39,6 @@
 -%>
 
 ActiveScaffold.render_form_field('<%= source_id %>','<%= escape_javascript(html) %>', <%= options.to_json.html_safe %>);
-<%if column.update_columns && !column.update_columns.empty?%>
-<%=  render(partial: "render_field", collection: column.update_columns, locals: {source_id: source_id, scope: scope})%>
+<%if column.update_columns.present?%>
+<%= render(partial: 'render_field', collection: column.update_columns, locals: {source_id: source_id, scope: scope}) %>
 <%end%>

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

@@ -1 +1 @@
-<%= render :partial => list_record_view, :locals => {:record => record} %>
+<%= render 'list_record', record: record %>

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

@@ -1,6 +1,6 @@
 <%
   live_search = active_scaffold_config.search.live?
-  url_options =  params_for(action: :index, id: nil, search: nil)
+  url_options = params_for(action: :index, id: nil, search: nil)
   submit_text ||= :search
   xhr ||= request.xhr?
   options = {
@@ -19,8 +19,9 @@
     <% key, value = pair.split('=', 2).map { |str| Rack::Utils.unescape(str) } -%>
     <%= hidden_field_tag(key, value) %>
   <% end -%>
-  <%= search_field_tag :search, (search_params if search_params.is_a? String), :class => 'text-input', :id => search_input_id, :size => 50, :autocomplete => :off, :placeholder => as_(live_search ? :live_search : :search_terms) %>
-  <%= submit_tag as_(submit_text), :class => "submit", :style => ('display:none;' if live_search) %>
+  <% field_placeholder = as_(live_search ? :live_search : :search_terms) %>
+  <%= search_field_tag :search, (search_params if search_params.is_a? String), class: 'text-input', id: search_input_id, size: 50, autocomplete: :off, placeholder: field_placeholder %>
+  <%= submit_tag as_(submit_text), class: 'submit', style: ('display:none;' if live_search) %>
   <%
     reset_attrs = {class: 'as_cancel reset'}
     if active_scaffold_config.search.reset_form
@@ -29,6 +30,6 @@
       reset_attrs.merge! remote: true, data: {refresh: true}
     end
   %>
-  <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), reset_attrs unless local_assigns[:skip_reset] %>
-  <%= loading_indicator_tag(:action => :search) %>
+  <%= link_to as_(:reset), url_for(url_options.merge(search: '')), reset_attrs unless local_assigns[:skip_reset] %>
+  <%= loading_indicator_tag(action: :search) %>
 <% end %>

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

@@ -1,8 +1,8 @@
 <h4><%= active_scaffold_config.show.label(@record.to_label.nil? ? nil : h(@record.to_label)) %></h4>
 
-<%= render :partial => 'show_columns', :locals => {:columns => active_scaffold_config.show.columns, :record => @record} -%>
+<%= render 'show_columns', columns: active_scaffold_config.show.columns, record: @record -%>
 
 <p class="form-footer">
-  <%= link_to as_(:close), main_path_to_return, :class => 'as_cancel', :remote => request.xhr? %>
-  <%= loading_indicator_tag(:action => :create, :id => params[:id]) %>
+  <%= link_to as_(:close), main_path_to_return, class: 'as_cancel', remote: request.xhr? %>
+  <%= loading_indicator_tag(action: :create, id: params[:id]) %>
 </p>

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

@@ -8,7 +8,7 @@
         auth, reason = action_link_authorized?(link, record)
         next unless auth
       -%>
-      <%= render_action_link(link, record, :authorized => true, :page => true) -%>
+      <%= render_action_link(link, record, authorized: true, page: true) -%>
     <% end -%>
   </div>
 </div>

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

@@ -1,2 +1,2 @@
 <% associated = column.association.singular? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a -%>
-<%= render :partial => "show_association_#{show_partial}", :locals => {:column => column, :parent_record => parent_record, :associated => associated} if associated.present? %>
+<%= render "show_association_#{show_partial}", column: column, parent_record: parent_record, associated: associated if associated.present? %>

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

@@ -12,7 +12,7 @@
   </thead>
   <tbody>
 <% associated.each do |record| -%>
-    <%= render :partial => 'show_horizontal_record', :locals => {:record => record, :parent_record => parent_record, :columns => show_columns_for(associated.first, column, columns_hash)} %>
+    <%= render 'show_horizontal_record', record: record, parent_record: parent_record, columns: show_columns_for(associated.first, column, columns_hash) %>
 <% end -%>
   </tbody>
 </table>

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

@@ -1,4 +1,4 @@
 <% columns_hash = {} -%>
 <% associated.each do |record| -%>
-  <%= render :partial => "show_columns", :locals => {:columns => show_columns_for(record, column, columns_hash), :record => record} %>
+  <%= render 'show_columns', columns: show_columns_for(record, column, columns_hash), record: record %>
 <% end -%>

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

@@ -3,7 +3,7 @@
   <dt><%= show_label(column) -%></dt>
 <% if column.respond_to? :each_column -%>
   <dd>
-    <%= render :partial => 'show_columns', :locals => {:columns => column, :record => record} %>
+    <%= render 'show_columns', columns: column, record: record %>
 <% else -%>
     <% css_class = "#{column.name}-view"
      css_class.concat(" #{column.css_class}") unless column.css_class.nil? %>

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

@@ -11,7 +11,7 @@
     end
     columns_length += 1
   %>
-  <%= content_tag :td, content_tag(:span, show_column_value(record, column)), :class => "#{column.name}-column #{:numeric if column.number?}" %>
+  <%= content_tag :td, content_tag(:span, show_column_value(record, column)), class: "#{column.name}-column #{:numeric if column.number?}" %>
 <% end -%>
 </tr>
 <% columns_groups.each do |columns_group| %>

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

@@ -7,7 +7,7 @@
         auth, reason = action_link_authorized?(link, record)
         next unless auth
       -%>
-      <%= render_action_link(link, record, :authorized => true) -%>
+      <%= render_action_link(link, record, authorized: true) -%>
     <% end -%>
   </div>
 </div>

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

@@ -1,5 +1,5 @@
 <% calculations_id ||= active_scaffold_calculations_id -%>
-<% if active_scaffold_config.actions.include?(:list) && list_columns.any? {|c| c.calculation?} %>
+<% if active_scaffold_config.actions.include?(:list) && list_columns.any?(&:calculation?) %>
 <% params.delete(:id) %>
-  ActiveScaffold.replace('<%= calculations_id %>', '<%= escape_javascript(render(:partial => 'list_calculations')) %>');
+  ActiveScaffold.replace('<%= calculations_id %>', '<%= escape_javascript(render('list_calculations')) %>');
 <% end %>

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

@@ -1,16 +1,17 @@
 <%
-  column = if update_column.is_a? ActiveScaffold::DataStructures::Column
-    update_column
-  else
-    active_scaffold_config.columns[update_column]
-  end
+  column =
+    if update_column.is_a? ActiveScaffold::DataStructures::Column
+      update_column
+    else
+      active_scaffold_config.columns[update_column]
+    end
   @rendered ||= Set.new
   return if @rendered.include? column.name
   @rendered << column.name
 -%>
-<% if @record.authorized_for?(:crud_type => :read, :column => column.name) -%>
+<% if @record.authorized_for?(crud_type: :read, column: column.name) -%>
   ActiveScaffold.replace_html('<%= row_id %> .<%= column.name %>-column','<%= escape_javascript(render_list_column(get_column_value(@record, column), column, @record)) %>');
 <% end -%>
 <% if column.update_columns&.present? %>
-  <%=  render(:partial => 'update_column', :collection => column.update_columns & active_scaffold_config.list.columns.visible_columns_names, :locals => {:row_id => row_id})%>
+  <%=  render(partial: 'update_column', collection: column.update_columns & active_scaffold_config.list.columns.visible_columns_names, locals: {row_id: row_id})%>
 <% end %>

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

@@ -1,6 +1,6 @@
 <% cancel_link = true if cancel_link.nil? %>
-<%= render :partial => "base_form", :locals => {:xhr => xhr ||= nil,
-                                                :form_action => form_action ||= :update,
-                                                :method => method ||= :patch,
-                                                :cancel_link => cancel_link,
-                                                :headline => headline ||= @record.to_label.nil? ? active_scaffold_config.update.label : as_(:update_model, :model => h(@record.to_label))} %>
+<%= render partial: 'base_form', locals: {xhr: xhr ||= nil,
+                                          form_action: form_action ||= :update,
+                                          method: method ||= :patch,
+                                          cancel_link: cancel_link,
+                                          headline: headline ||= @record.to_label.nil? ? active_scaffold_config.update.label : as_(:update_model, model: h(@record.to_label))} %>

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

@@ -1,2 +1,2 @@
 <% messages_id ||= active_scaffold_messages_id -%>
-ActiveScaffold.replace_html('<%= messages_id %>', '<%= escape_javascript(render(:partial => 'messages')) %>');
+ActiveScaffold.replace_html('<%= messages_id %>', '<%= escape_javascript(render('messages')) %>');

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

@@ -1,4 +1,5 @@
-<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, 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 id="<%= sub_form_list_id(association: column.name, id: parent_record.id || generated_id(parent_record) || 99_999_999_999, tab_id: local_assigns[:tab_id]) %>">
+  <% record_partial_locals = {scope: scope, parent_record: parent_record, column: column, columns: local_assigns[:columns], layout: :vertical} %>
+  <%= 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 %>
 </div>

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

@@ -1,11 +1,11 @@
 <div class="active-scaffold">
   <div class="delete-view view">
-    <%= form_tag params_for(:action => link.action, :id => params[:id]), { :method => link.method } %>
+    <%= form_tag params_for(action: link.action, id: params[:id]), {method: link.method} %>
       <h4><%= link.confirm(h(record&.to_label)) -%></h4>
 
       <p class="form-footer">
-        <%= submit_tag as_(link.label(record)), :class => 'submit' %>
-        <%= link_to as_(:cancel), main_path_to_return, :class => 'cancel' %>
+        <%= submit_tag as_(link.label(record)), class: 'submit' %>
+        <%= link_to as_(:cancel), main_path_to_return, class: 'cancel' %>
       </p>
 
     </form>

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

@@ -1,14 +1,14 @@
-<% new_row = render :partial => list_record_view, :locals => {:record => @record} %>
-ActiveScaffold.create_record_row('<%= active_scaffold_id %>', '<%= escape_javascript(new_row) %>', <%= {:insert_at => :top}.to_json.html_safe %>);
+<% new_row = render 'list_record', record: @record %>
+ActiveScaffold.create_record_row('<%= active_scaffold_id %>', '<%= escape_javascript(new_row) %>', <%= {insert_at: :top}.to_json.html_safe %>);
 
-<%= render :partial => 'update_calculations', :formats => [:js] %>
+<%= render 'update_calculations' %>
 
 <% if form_stays_open ||= true %>
   <%# why not just re-render the form? that wouldn't utilize a possible do_new override which sets default values.%>
   ActiveScaffold.reset_form('<%= element_form_id %>');
-  ActiveScaffold.replace_html('<%= element_messages_id(:action => :add_existing) %>', '<%= escape_javascript(render(:partial => 'form_messages')) %>');
+  ActiveScaffold.replace_html('<%= element_messages_id(action: :add_existing) %>', '<%= escape_javascript(render(partial: 'form_messages')) %>');
   <%# have to delay the focus, because there's no "firstElement" in prototype until at least one element is not disabled%>
-  ActiveScaffold.focus_first_element_of_form<%= '.defer' if ActiveScaffold.js_framework == :prototype %>('<%= element_form_id %>');
+  ActiveScaffold.focus_first_element_of_form('<%= element_form_id %>');
 <% else %>
-  ActiveScaffold.find_action_link('<%= element_form_id(:action => :new_existing) %>').close();
+  ActiveScaffold.find_action_link('<%= element_form_id(action: :new_existing) %>').close();
 <% end %>

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

@@ -1,5 +1,5 @@
 <div class="active-scaffold">
   <div class="create-view <%= "#{id_from_controller params[:controller]}-view" %> view">
-    <%= render :partial => 'add_existing_form' -%>
+    <%= render 'add_existing_form' -%>
   </div>
 </div>

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

@@ -0,0 +1,15 @@
+<%
+  subsection_id = sub_section_id(sub_section: @column.label)
+  tab_options = send(override_helper_per_model(:active_scaffold_tab_options, @record.class), @column, @record)
+  tab_label, tab_value, tab_record = tab_options.find { |_, value, _| params[:value] == value.to_s }
+  if tab_label
+    tab_id_suffix = clean_id(tab_record&.id&.to_s || tab_value.to_s)
+    tab_id = "#{subsection_id}-#{tab_id_suffix}-tab"
+    tab_content = render('form', columns: @column, subsection_id: "#{subsection_id}-#{tab_id_suffix}", form_action: @form_action, scope: @scope, tab_value: tab_record || tab_value, tab_id: tab_id_suffix, tabbed_by: @column.tabbed_by)
+    tab = active_scaffold_tab_content(tab_id, true, tab_content)
+%>
+$('#<%= subsection_id %> .tab-content > .tab-pane.active').removeClass('in active');
+ActiveScaffold.create_associated_record_form('<%= subsection_id %> .tab-content', '<%= j tab %>', {singular: false});
+$('#<%= subsection_id %> .nav-tabs').find('.nav-item.active').removeClass('active').end().append('<%= j active_scaffold_tab(tab_label, tab_id, true) %>');
+$('#<%= @source_id %> option[value=<%= tab_value %>]').hide().parent().val('');
+<% end %>

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

@@ -1,5 +1,5 @@
 <div class="active-scaffold">
   <div class="create-view <%= "#{id_from_controller params[:controller]}-view" %> view">
-    <%= render :partial => 'create_form' -%>
+    <%= render 'create_form' -%>
   </div>
 </div>

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

@@ -1,11 +1,11 @@
 <div class="active-scaffold">
   <div class="delete-view view">
-    <%= form_tag params_for(:action => :destroy, :id => params[:id]), { :method => :delete } %>
-      <h4><%= as_(:are_you_sure_to_delete, :label => h(@record&.to_label)) -%></h4>
+    <%= form_tag params_for(action: :destroy, id: params[:id]), {method: :delete} %>
+      <h4><%= as_(:are_you_sure_to_delete, label: h(@record&.to_label)) -%></h4>
 
       <p class="form-footer">
-        <%= submit_tag as_(:delete), :class => 'submit' %>
-        <%= link_to as_(:cancel), main_path_to_return, :class => 'cancel' %>
+        <%= submit_tag as_(:delete), class: 'submit' %>
+        <%= link_to as_(:cancel), main_path_to_return, class: 'cancel' %>
       </p>
 
     </form>

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

@@ -3,9 +3,9 @@
   <% if render_parent? %>
     <% if render_parent_action == :row %>
       <% current_id = controller_id(params[:eid] || params[:parent_sti]) -%>
-      ActiveScaffold.delete_record_row('<%= element_row_id(:controller_id => current_id, :action => 'list', :id => params[:id]) %>', '<%= url_for params_for(render_parent_options.merge(id: nil, page: [active_scaffold_config.list.user.page.to_i - 1, 1].max)) %>');
-      <% messages_id = active_scaffold_messages_id(:controller_id => current_id) %>
-      <%= render :partial => 'update_calculations', :locals => {:calculations_id => active_scaffold_calculations_id(:controller_id => current_id)}, :formats => [:js] %>
+      ActiveScaffold.delete_record_row('<%= element_row_id(controller_id: current_id, action: 'list', id: params[:id]) %>', '<%= url_for params_for(render_parent_options.merge(id: nil, page: [active_scaffold_config.list.user.page.to_i - 1, 1].max)) %>');
+      <% messages_id = active_scaffold_messages_id(controller_id: current_id) %>
+      <%= render 'update_calculations', calculations_id: active_scaffold_calculations_id(controller_id: current_id) %>
     <% elsif render_parent_action == :index %>
       <% if controller.respond_to?(:render_component_into_view, true) %>
         <%= escape_javascript(controller.send(:render_component_into_view, render_parent_options)) %>
@@ -13,20 +13,22 @@
         ActiveScaffold.reload('<%= url_for render_parent_options %>');
       <% end %>
     <% end %>
-  <% elsif (active_scaffold_config.delete.refresh_list) %>
+  <% elsif active_scaffold_config.delete.refresh_list %>
     <%= render 'refresh_list', no_history: true %>
   <% else %>
     <%
-      if active_scaffold_config.actions.exclude?(:list) || active_scaffold_config.list.pagination
-        url = main_path_to_return
-        url[:page] = [active_scaffold_config.list.user.page.to_i - 1, 1].max if url.is_a?(Hash) && active_scaffold_config.actions.include?(:list)
-        url = url_for(url)
-      end
+      url = main_path_to_return
+      url[:page] = [active_scaffold_config.list.user.page.to_i - 1, 1].max if url.is_a?(Hash) && active_scaffold_config.actions.include?(:list)
     %>
-    ActiveScaffold.delete_record_row('<%= element_row_id(:action => 'list', :id => params[:id]) %>', '<%= url %>');
-    <%= render :partial => 'update_calculations', :formats => [:js] %>
+    ActiveScaffold.delete_record_row('<%= element_row_id(action: 'list', id: params[:id]) %>', '<%= url_for(url) %>');
+    <%= render 'update_calculations' %>
   <% end %>
 <% else %>
-  <% flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br) if @record.errors.present? %>
+  <%
+    if @record.errors.present?
+      object_name = "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}"
+      flash[:error] = active_scaffold_error_messages_for(@record, object_name: object_name, header_message: '', message: object_name, container_tag: nil, list_type: :br)
+    end
+  %>
 <% end %>
-<%= render :partial => 'update_messages', :locals => {:messages_id => messages_id} %>
+<%= render 'update_messages', messages_id: messages_id %>

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

@@ -1,7 +1,7 @@
 <%
-subform_id = sub_form_list_id(:association => @column.name, :id => @parent_record.id || generated_id(@parent_record) || 99999999999)
-associated_form = render :partial => "form_association_record", :object => @record, :locals => {:scope => @scope, :parent_record => @parent_record, :column => @column, :locked => @record.new_record? && @column.association.singular?}
-options = {:singular => false}
+subform_id = sub_form_list_id(association: @column.name, tab_id: (params[:value] if params[:tabbed_by]), id: @parent_record.id || generated_id(@parent_record) || 99_999_999_999)
+associated_form = render 'form_association_record', scope: @scope, parent_record: @parent_record, column: @column, record: @record, locked: @record.new_record? && @column.association.singular?
+options = {singular: false}
 if @column.association.singular?
   options[:singular] = true
 else

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

@@ -1,5 +1,5 @@
 <div class="active-scaffold">
   <div class="search-view view">
-    <%= render :partial => 'field_search' -%>
+    <%= render 'field_search' -%>
   </div>
 </div>

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

@@ -1 +1 @@
-ActiveScaffold.replace_html('<%=element_messages_id%>','<%=escape_javascript(render(:partial => 'form_messages'))%>');
+ActiveScaffold.replace_html('<%=element_messages_id%>','<%=escape_javascript(render('form_messages'))%>');

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

@@ -1 +1 @@
-<%= render :partial => 'list_with_header' -%>
+<%= render 'list_with_header' -%>

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

@@ -1,18 +1,18 @@
 var link;
 <% if @action_link&.position %>
-link = ActiveScaffold.find_action_link('<%= element_form_id(:action => action_name) %>');
+link = ActiveScaffold.find_action_link('<%= element_form_id(action: action_name) %>');
 <% end %>
 <% if successful? %>
   <% if @record %>
-    <%= render :partial => 'update_messages' %>
-    <% row = escape_javascript(render(:partial => list_record_view, :locals => {:record => @record})) -%>
+    <%= render 'update_messages' %>
+    <% row = escape_javascript(render('list_record', record: @record)) -%>
     <% if @action_link&.position %>
 if (link) link.close('<%= row %>');
     <% else %>
-      ActiveScaffold.update_row('<%= element_row_id(:action => :list, :id => @record.id) %>', '<%= row %>');
-      ActiveScaffold.scroll_to('<%= element_row_id(:action => :list, :id => @record.id) %>', true);
+      ActiveScaffold.update_row('<%= element_row_id(action: :list, id: @record.id) %>', '<%= row %>');
+      ActiveScaffold.scroll_to('<%= element_row_id(action: :list, id: @record.id) %>', true);
     <% end %>
-    <%= render :partial => 'update_calculations', :formats => [:js] %>
+    <%= render 'update_calculations' %>
   <% else %>
     <% if @action_link&.position %>
 if (link) link.close();
@@ -20,8 +20,13 @@ if (link) link.close();
     <%= render 'refresh_list', no_history: true %>
   <% end %>
 <% else %>
-  <% flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br) if @record&.errors.present? %>
-  <% messages = escape_javascript(render(:partial => 'messages')) %>
+  <%
+    if @record&.errors.present?
+      object_name = "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}"
+      flash[:error] = active_scaffold_error_messages_for(@record, object_name: object_name, header_message: '', message: object_name, container_tag: nil, list_type: :br)
+    end
+  %>
+  <% messages = escape_javascript(render('messages')) %>
   <% if @action_link&.position %>
 if (link) {
   link.update_flash_messages('<%= messages %>');

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

@@ -1,21 +1,49 @@
 try {
 var action_link;
 <%
-  form_selector ||= "#{element_form_id(:action => :create)}"
+  form_selector ||= element_form_id(action: :create)
   insert_at ||= :top 
   always_show_create ||= active_scaffold_config.actions.include?(:list) && active_scaffold_config.list.always_show_create
 -%>
 <% if always_show_create -%>
-<%= render :partial => 'update_messages' %>
+<%= render 'update_messages' %>
 <% else -%>
 action_link = ActiveScaffold.find_action_link('<%= form_selector %>');
-if (action_link) action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'messages')) %>');
+if (action_link) action_link.update_flash_messages('<%= escape_javascript(render('messages')) %>');
 <% end -%>
 <% if successful? -%>
-  <%= render 'new_record', insert_at: insert_at %>
-  <%= render 'refresh_create_form', always_show_create: always_show_create, form_selector: form_selector unless render_parent? %>
+  <% if render_parent? %>
+    <% if nested_singular_association? %>
+    if (action_link) action_link.close(true);
+    <% elsif params[:parent_sti] && render_parent_action == :row %>
+      ActiveScaffold.create_record_row_from_url(action_link,'<%= url_for(render_parent_options) %>', <%= {insert_at: insert_at}.to_json.html_safe %>);
+    <% else %>
+      ActiveScaffold.reload('<%= url_for render_parent_options %>');
+    <% end %>
+  <% elsif active_scaffold_config.create.refresh_list %>
+    <%= render 'refresh_list', no_history: true %>
+  <% elsif params[:parent_controller].nil? %>
+    <% new_row = render 'list_record', 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' %>
+  <% end %>
+
+  <% unless render_parent? %>
+    <% if always_show_create %>
+      ActiveScaffold.reset_form('<%= form_selector %>');
+    <% elsif params[:dont_close] %>
+      ActiveScaffold.replace('<%= form_selector %>','<%= escape_javascript(render('create_form', xhr: true)) %>');
+      ActiveScaffold.focus_first_element_of_form('<%= form_selector %>');
+    <% else %>
+      if (action_link) action_link.close();
+    <% end %>
+    <% if active_scaffold_config.create.action_after_create %>
+      var link = ActiveScaffold.find_action_link('<%= action_link_id active_scaffold_config.create.action_after_create, @record.id || @saved_record.id %>');
+      if (link) link.open();
+    <% end %>
+  <% end %>
 <% else %>
-  ActiveScaffold.replace('<%= form_selector %>','<%= escape_javascript(render(:partial => 'create_form', :locals => {:xhr => true})) %>');
+  ActiveScaffold.replace('<%= form_selector %>','<%= escape_javascript(render('create_form', xhr: true)) %>');
   ActiveScaffold.scroll_to('<%= form_selector %>', true);
 <% end %>
 } catch (e) { alert('RJS error:\n\n' + e.toString());}

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

@@ -1,6 +1,6 @@
 <%
-  checked = all_marked? unless local_assigns.has_key? :checked
-  options = {:checked => checked, :include_mark_all => true, :include_checkboxes => @include_checkboxes}
+  checked = all_marked? unless local_assigns.key? :checked
+  options = {checked: checked, include_mark_all: true, include_checkboxes: @include_checkboxes}
 %>
 ActiveScaffold.mark_records('<%= active_scaffold_tbody_id %>',<%= options.to_json.html_safe %>);
-<%= render :partial => 'update_messages' %>
+<%= render 'update_messages' %>

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

@@ -1,13 +1,13 @@
 try {
-<% form_selector ||= "#{element_form_id(:action => :update, :id => @record&.id || params[:id])}" %>
+<% form_selector ||= element_form_id(action: :update, id: @record&.id || params[:id]) %>
 var action_link = ActiveScaffold.find_action_link('<%= form_selector %>');
-if (action_link) action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'messages')) %>');
+if (action_link) action_link.update_flash_messages('<%= escape_javascript(render('messages')) %>');
 <% if successful? %>
   <% if params[:dont_close] %>
-    <% row_selector = element_row_id(:action => :list, :id => @record.id) %>
-    ActiveScaffold.update_row('<%= row_selector %>', '<%= escape_javascript(render(:partial => list_record_view, :locals => {:record => @record})) %>');
+    <% row_selector = element_row_id(action: :list, id: @record.id) %>
+    ActiveScaffold.update_row('<%= row_selector %>', '<%= escape_javascript(render('list_record', record: @record)) %>');
     if (action_link) action_link.target = $('#<%= row_selector %>');
-    <%= render :partial => 'update_calculations', :formats => [:js] %>
+    <%= render 'update_calculations' %>
     <% if params[:iframe] == 'true' %>
       ActiveScaffold.enable_form('<%= form_selector %>');
     <% end %>
@@ -22,16 +22,16 @@ if (action_link) action_link.update_flash_messages('<%= escape_javascript(render
       <%= render 'refresh_list', no_history: true %>
     <% else %>
       <% if @record %>
-      if (action_link) action_link.close('<%= escape_javascript(render(:partial => list_record_view, :locals => {:record => @record})) %>');
+      if (action_link) action_link.close('<%= escape_javascript(render('list_record', record: @record)) %>');
       <% else %>
       if (action_link) action_link.close();
-      ActiveScaffold.delete_record_row('<%= element_row_id(:action => :list, :id => params[:id]) %>');
+      ActiveScaffold.delete_record_row('<%= element_row_id(action: :list, id: params[:id]) %>');
       <% end %>
-      <%= render :partial => 'update_calculations', :formats => [:js] %>
+      <%= render 'update_calculations' %>
     <% end %>
   <% end %>
 <% else %>
-  ActiveScaffold.replace('<%= form_selector %>', '<%= escape_javascript(render(:partial => 'update_form', :locals => {:xhr => true})) %>');
+  ActiveScaffold.replace('<%= form_selector %>', '<%= escape_javascript(render('update_form', xhr: true)) %>');
   ActiveScaffold.scroll_to('<%= form_selector %>', true);
 <% end %>
 } catch (e) { alert('RJS error:\n\n' + e.toString());}

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

@@ -1 +1 @@
-<%= render :partial => "render_field", :collection => @columns, :locals => {:source_id => @source_id, :scope => @scope} %>
+<%= render partial: 'render_field', collection: @columns, locals: {source_id: @source_id, scope: @scope} %>

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

@@ -1,6 +1,6 @@
 <%
   column = active_scaffold_config.columns[@column.name]
-  options = active_scaffold_input_options(column, nil, :object => @record)
+  options = active_scaffold_input_options(column, nil, object: @record)
   options[:class] = "#{options[:class]} inplace_field"
 -%>
 <%= active_scaffold_input_for(column, nil, options) %>

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

@@ -1,2 +1,2 @@
-ActiveScaffold.update_row('<%= element_row_id(action: :list, id: @record&.id) %>', '<%= escape_javascript render(list_record_view, record: @record) %>');
-<%= render :partial => 'update_calculations', :formats => [:js] %>
+ActiveScaffold.update_row('<%= element_row_id(action: :list, id: @record&.id) %>', '<%= escape_javascript render('list_record', record: @record) %>');
+<%= render 'update_calculations' %>

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

@@ -1,5 +1,5 @@
 <div class="active-scaffold">
   <div class="search-view <%= "#{id_from_controller params[:controller]}-view" %> view">
-    <%= render :partial => 'search' -%>
+    <%= render 'search' -%>
   </div>
 </div>

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

@@ -1,11 +1,11 @@
 <div class="active-scaffold">
   <div class="show-view <%= "#{id_from_controller params[:controller]}-view" %> view">
     <% if active_scaffold_config.show.inline_links and !active_scaffold_config.action_links.member.empty? -%>
-      <%= render :partial => 'show_actions', :locals => {:record => @record, :position => :header} %>
+      <%= render 'show_actions', record: @record, position: :header %>
     <% end -%>
-    <%= render :partial => 'show' -%>
+    <%= render 'show' -%>
     <% if active_scaffold_config.show.inline_links and !active_scaffold_config.action_links.member.empty? -%>
-      <%= render :partial => 'show_actions', :locals => {:record => @record, :position => :footer} %>
+      <%= render 'show_actions', record: @record, position: :footer %>
     <% end -%>
   </div>
 </div>

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

@@ -1,8 +1,8 @@
 <div class="active-scaffold">
   <div class="update-view <%= "#{id_from_controller params[:controller]}-view" %> view">
     <% if active_scaffold_config.update.nested_links and !active_scaffold_config.action_links.member.empty? -%>
-    <%= render :partial => 'update_actions', :locals => {:record => @record} %>
+    <%= render 'update_actions', record: @record %>
     <% end -%>
-    <%= render :partial => 'update_form' -%>
+    <%= render 'update_form' -%>
   </div>
 </div>