active_scaffold 3.7.12 → 4.0.0.rc1

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

@@ -1,8 +1,11 @@
-<% form_action ||= :create
-   cancel_link = true if cancel_link.nil? %>
-<%= render :partial => "base_form", :locals => {:xhr => xhr ||= nil,
-                                                :form_action => form_action,
-                                                :method => method ||= :post,
-                                                :cancel_link => cancel_link,
-                                                :headline => headline ||= active_scaffold_config.send(form_action).label(active_scaffold_config.add_sti_create_links? ? @record.class.model_name.human(:count => 1) : nil)} %>
+<%
+   form_action ||= :create
+   cancel_link = true if cancel_link.nil?
+   headline ||= active_scaffold_config.send(form_action).label(active_scaffold_config.add_sti_create_links? ? @record.class.model_name.human(count: 1) : nil)
+%>
+<%= render partial: 'base_form', locals: {xhr: xhr ||= nil,
+                                          form_action: form_action,
+                                          method: method ||= :post,
+                                          cancel_link: cancel_link,
+                                          headline: headline} %>
 

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

@@ -1,6 +1,6 @@
 <% cancel_link = false if cancel_link.nil? %>
-<%= render :partial => "base_form", :locals => {:xhr => xhr ||= nil,
-                                                :form_action => form_action ||= :create,
-                                                :method => method ||= :post,
-                                                :cancel_link => cancel_link,
-                                                :headline => headline ||= active_scaffold_config.create.label(active_scaffold_config.add_sti_create_links? ? @record.class.model_name.human(:count => 1) : nil)} %>
+<%= render partial: 'base_form', locals: {xhr: xhr ||= nil,
+                                          form_action: form_action ||= :create,
+                                          method: method ||= :post,
+                                          cancel_link: cancel_link,
+                                          headline: headline ||= active_scaffold_config.create.label(active_scaffold_config.add_sti_create_links? ? @record.class.model_name.human(count: 1) : nil)} %>

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

@@ -4,7 +4,7 @@
   xhr ||= request.xhr?
   options = {
     id: element_form_id(action: 'search'),
-    class: "as_form search",
+    class: 'as_form search',
     remote: xhr,
     data: {loading: true},
     method: :get
@@ -27,10 +27,10 @@
     <% end -%>
     <% unless hiddens.empty?  -%>
       <li class="sub-section">
-      <% further_options_id = sub_section_id(:sub_section => 'further_options') %>
+      <% further_options_id = sub_section_id(sub_section: 'further_options') %>
       <h5>
         <%= as_(:optional_attributes) %>
-        <%= link_to_visibility_toggle(further_options_id, {:default_visible => false}) %>
+        <%= link_to_visibility_toggle(further_options_id, default_visible: false) %>
       </h5>
       <ol id ="<%= further_options_id %>" class="form" style="display:none;">
       <% hiddens.each do |column| -%>
@@ -50,8 +50,8 @@
         reset_attrs.merge! remote: true, data: {refresh: true}
       end
     %>
-    <%= submit_tag as_(submit_text), :class => "submit" %>
-    <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), reset_attrs unless local_assigns[:skip_reset] %>
-    <%= loading_indicator_tag(:action => :search) %>
+    <%= submit_tag as_(submit_text), class: 'submit' %>
+    <%= link_to as_(:reset), url_for(url_options.merge(search: '')), reset_attrs unless local_assigns[:skip_reset] %>
+    <%= loading_indicator_tag(action: :search) %>
   </p>
 </form>

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

@@ -1,31 +1,28 @@
 <%
   scope ||= nil
   subsection_id ||= nil
+  tab_value ||= nil
+  tabbed_by ||= nil
+  tab_id ||= nil
   show_unauthorized_columns = active_scaffold_config.send(form_action).show_unauthorized_columns if active_scaffold_config.actions.include? form_action
 %>
-<ol class="form" <%= "id=#{subsection_id}" unless subsection_id.nil? %> <%= "style=\"display: none;\"".html_safe if columns.collapsed %>>
+<ol class="form" <%= "id=#{subsection_id}" unless subsection_id.nil? %> <%= 'style="display: none;"'.html_safe if columns.collapsed %>>
   <% columns.each_column(for: @record, crud_type: (:read if show_unauthorized_columns)) do |column| %>
   <% column_css_class = column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>
   <% renders_as = column_renders_as(column) %>
-  <% authorized = show_unauthorized_columns || renders_as == :subsection ? @record.authorized_for?(:crud_type => form_action, :column => column.name) : true %>
-  <% if renders_as == :subsection -%>
-  <% if authorized %>
-    <% subsection_id = sub_section_id(:sub_section => column.label) %>
+  <% authorized = show_unauthorized_columns || renders_as == :subsection ? @record.authorized_for?(crud_type: form_action, column: column.name) : true %>
+  <% if renders_as == :subsection || renders_as == :tabbed -%>
+    <% next unless authorized %>
   <li class="sub-section <%= column_css_class %>">
-    <h5>
-      <%= column.label %>
-      <%= link_to_visibility_toggle(subsection_id, {:default_visible => !column.collapsed}) -%>
-    </h5>
-    <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id, :form_action => form_action, :scope => scope } %>
+    <%= render_subsection(column, @record, scope, form_action) %>
   </li>
-  <% end %>
   <% elsif renders_as == :subform and authorized -%>
-  <%= content_tag :li, active_scaffold_subform_attributes(column, column_css_class) do %>
-    <%= render_column(column, @record, renders_as, scope) %>
+  <%= content_tag :li, active_scaffold_subform_attributes(column, column_css_class, tab_id: tab_id) do %>
+    <%= render_column(column, @record, renders_as, scope, tabbed_by: (column.options[:tabbed_by] || tabbed_by if tabbed_by), tab_value: tab_value, tab_id: tab_id) %>
   <% end %>
   <% else -%>
   <li class="form-element <%= 'required' if column.required?(action_for_validation?(@record)) %> <%= column.form_ui %> <%= column_css_class %>">
-    <%= render_column(column, @record, renders_as, scope, !authorized) %>
+    <%= render_column(column, @record, renders_as, scope, only_value: !authorized) %>
   </li>
   <% end -%>
   <% end -%>

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

@@ -1,15 +1,24 @@
 <%
-associated = column.association.singular? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a
-if column.show_blank_record?(associated)
-  show_blank_record = build_associated(column.association, parent_record)
-end
-disable_required_for_new = @disable_required_for_new
-@disable_required_for_new = !!show_blank_record unless (column.association.singular? && column.required?(action_for_validation?(parent_record)))
-subform_div_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || generated_id(parent_record) || 99999999999)}-div"
+  tabbed_by ||= nil
+  tab_value ||= nil
+  tab_id ||= nil
+  associated = column.association.singular? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a
+  associated = associated.select { |record| record.send(tabbed_by) == tab_value } if tabbed_by && tab_value
+  if column.show_blank_record?(associated)
+    show_blank_record = build_associated(column.association, parent_record) do |blank_record|
+      blank_record.send(:"#{tabbed_by}=", tab_value) if tabbed_by && tab_value
+    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))
+  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
-# so generated_id for blank associated record is not used in create new button
-footer = render(:partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated, :scope => scope})
+  # render footer before rendering associated records, fixes create new on self-associations
+  # so generated_id for blank associated record is not used in create new button
+  footer = render('form_association_footer', {
+    parent_record: parent_record, column: column, associated: associated, scope: scope, subform_div_id: subform_div_id,
+    tabbed_by: tabbed_by, tab_value: tab_value
+  })
 -%>
 <h5>
   <%= column.label -%>
@@ -18,8 +27,8 @@ footer = render(:partial => 'form_association_footer', :locals => {:parent_recor
 <%= 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? %>
-  <%= render :partial => subform_partial_for_column(column), :locals => {:column => column, :parent_record => parent_record, :associated => associated, :show_blank_record => show_blank_record, :scope => scope} %>
+  <%= hidden_field_tag "#{(opts = active_scaffold_input_options(column, scope, object: parent_record))[:name]}[0]", '', id: "#{opts[:id]}_0" if column.association.collection? %>
+  <%= render subform_partial_for_column(column), column: column, parent_record: parent_record, associated: associated, show_blank_record: show_blank_record, scope: scope, tab_id: tab_id %>
   <%= footer -%>
 </div>
 <%

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

@@ -13,36 +13,45 @@ return unless show_add_new or show_add_existing
 temporary_id = generated_id(parent_record) if parent_record.new_record?
 controller_path = active_scaffold_controller_for(parent_record.class).controller_path
 parent_controller = (main_form_controller || controller).controller_path
-url_options = {:controller => controller_path, :action => 'edit_associated', :child_association => column.name, :scope => scope, :id => parent_record.to_param, :generated_id => temporary_id, :parent_controller => parent_controller}
-edit_associated_url = params_for(url_options.merge(:associated_id => '--ID--')) if show_add_existing
-add_new_url = params_for(url_options) if show_add_new
+url_options = {controller: controller_path, action: 'edit_associated', child_association: column.name, scope: scope, id: parent_record.to_param, generated_id: temporary_id, parent_controller: parent_controller}
+edit_associated_url = params_for(url_options.merge(associated_id: '--ID--')) if show_add_existing
+if show_add_new
+  if local_assigns[:tabbed_by]
+    url_options.merge! tabbed_by: tabbed_by, value: tab_value
+    if (tabbed_association = tabbed_by_association(column, tabbed_by))
+      url_options[:value] = tab_value.id
+      url_options[:value_type] = tab_value.class.base_class.sti_name if tabbed_association.polymorphic?
+    end
+  end
+  add_new_url = params_for(url_options)
+end
 
 -%>
 <div class="footer-wrapper">
   <div class="footer">
     <% if show_add_new -%>
     <% if column.association.collection?
-         add_label = as_(:create_another, :model => column.association.klass.model_name.human)
+         add_label = as_(:create_another, model: column.association.klass.model_name.human)
          add_class = 'as_create_another'
        else
          add_label = as_(:replace_with_new)
          add_class = 'as_replace_with_new'
        end
-       create_another_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || temporary_id || 99999999999)}-create-another" %>
-    <%= link_to add_label, add_new_url, :id => create_another_id, :remote => true, :class => "as-js-button #{add_class}", :style=> "display: none;" %>
+       create_another_id = "#{subform_div_id}-create-another" %>
+    <%= link_to add_label, add_new_url, id: create_another_id, remote: true, class: "as-js-button #{add_class}", style: 'display: none;' %>
     <% end -%>
 
-    <%= '|' if show_add_new and show_add_existing %>
+    <%= '|' if show_add_new && show_add_existing %>
 
     <% if show_add_existing -%>
-      <% if remote_controller and remote_controller.respond_to? :uses_record_select? and remote_controller.uses_record_select? -%>
+      <% if remote_controller.respond_to?(:uses_record_select?) && remote_controller.uses_record_select? -%>
         <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, record_select_params_for_add_existing(column.association, edit_associated_url, parent_record) -%>
       <% else -%>
         <% select_options = options_from_collection_for_select(sorted_association_options_find(column.association, nil, parent_record), :to_param, :to_label)
-           add_existing_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || temporary_id || 99999999999)}-add-existing"
+           add_existing_id = "#{subform_div_id}-add-existing"
            add_existing_label = column.association.collection? ? :add_existing : :replace_existing %>
         <%= select_tag 'associated_id', content_tag(:option, as_(:_select_), value: '') + select_options %>
-        <%= link_to as_(add_existing_label), edit_associated_url, :id => add_existing_id, :remote => true, :class=> "as-js-button as_#{add_existing_label}", :style => "display: none;" %>
+        <%= link_to as_(add_existing_label), edit_associated_url, id: add_existing_id, remote: true, class: "as-js-button as_#{add_existing_label}", style: 'display: none;' %>
       <% end -%>
     <% end -%>
   </div>

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

@@ -1,14 +1,13 @@
 <%
   record_column = column
-  record = form_association_record
-  readonly = (record.readonly? or not record.authorized_for?(:crud_type => :update))
+  readonly = record.readonly? || !record.authorized_for?(crud_type: :update)
   crud_type = record.new_record? ? :create : (readonly ? :read : :update)
   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)
+  options = active_scaffold_input_options(config.columns[record.class.primary_key], scope, object: record)
   tr_id = "association-#{options[:id]}"
   layout ||= config.subform.layout
 
@@ -34,14 +33,14 @@
   columns_length = 0
   columns_groups = []
 -%>
-<%= content_tag record_tag, :class => "sub-form-record" do %>
+<%= content_tag record_tag, class: 'sub-form-record' do %>
   <% unless record.errors.empty? -%>
-  <%= content_tag error_tag, :class => "association-record-errors", :id => element_messages_id(:action => record.class.name.underscore, :id => "#{parent_record.id}-#{index}") do %>
-    <% errors = active_scaffold_error_messages_for(:record, :object => record) %>
-    <%= error_inner_tag ? content_tag(error_inner_tag, errors, :colspan => (active_scaffold_config_for(record.class).subform.columns.length + 1 if error_inner_tag == :td)) : errors %>
+  <%= content_tag error_tag, class: 'association-record-errors', id: element_messages_id(action: record.class.name.underscore, id: "#{parent_record.id}-#{index}") do %>
+    <% errors = active_scaffold_error_messages_for(:record, object: record) %>
+    <%= error_inner_tag ? content_tag(error_inner_tag, errors, colspan: (active_scaffold_config_for(record.class).subform.columns.length + 1 if error_inner_tag == :td)) : errors %>
   <% end %>
   <% end %>
-  <%= content_tag row_tag, :id => tr_id, :class => "association-record#{' association-record-new' if record.new_record?}#{' locked' if locked}" do %>
+  <%= content_tag row_tag, id: tr_id, class: "association-record#{' association-record-new' if record.new_record?}#{' locked' if locked}" do %>
   <% columns.each_column(for: record.class, crud_type: :read, flatten: flatten) do |column| %>
   <%
     if column.respond_to? :each_column
@@ -52,29 +51,24 @@
     next unless in_subform?(column, parent_record, record_column)
     columns_length += 1
     show_actions = true
-    if !ActiveScaffold.nested_subforms && !readonly && column.association && column.form_ui.nil?
-      ActiveSupport::Deprecation.warn "Nested subforms are allowed now, set form_ui = :select for #{column.name} in controller for #{config.model.name}"
-      column = column.dup unless ActiveScaffold.threadsafe
-      column.form_ui = :select
-    end
 
     col_class = default_col_class.clone
     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
   -%>
-    <%= content_tag column_tag, :class => col_class.join(' ') do %>
+    <%= content_tag column_tag, class: col_class.join(' ') do %>
       <%= active_scaffold_render_subform_column(column, scope, crud_type, readonly, false, record) %>
     <% end %>
   <% end -%>
   <% if show_actions -%>
-    <%= content_tag column_tag, :class => "actions" do %>
+    <%= content_tag column_tag, class: 'actions' do %>
       <% if record_column.association.collection? && !locked %>
         <%
-          auth = [:destroy, :delete_all, :delete].exclude?(record_column.association.dependent)
-          auth, reason = record.authorized_for?(:crud_type => :delete, :reason => true) unless auth
+          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 %>
+        <%= auth ? link_to(as_(:remove), '#', class: 'destroy', id: "#{options[:id]}-destroy", data: {delete_id: tr_id}) : reason %>
       <% end %>
       <% unless record.new_record? %>
         <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= record.id -%>" />
@@ -84,7 +78,7 @@
   <% end %>
 
   <% columns_groups.each do |columns_group| %>
-  <%= content_tag row_tag, :class => 'associated-record' do %>
+  <%= content_tag row_tag, class: 'associated-record' do %>
     <% if layout == :vertical %>
       <% columns_group.each_column(for: record.class, crud_type: :read, flatten: true) do |col| %>
         <%
@@ -93,12 +87,12 @@
           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
         %>
-        <%= content_tag column_tag, :class => col_class, :colspan => (columns_length if column_tag == :td) do %>
+        <%= content_tag column_tag, class: col_class, colspan: (columns_length if column_tag == :td) do %>
           <%= active_scaffold_render_subform_column(col, scope, crud_type, readonly, false, record) %>
         <% end %>
       <% end %>
     <% else %>
-      <%= content_tag column_tag, :colspan => (columns_length if column_tag == :td) do %>
+      <%= content_tag column_tag, colspan: (columns_length if column_tag == :td) do %>
       <% columns_group.each_column(for: record.class, crud_type: :read, flatten: true) do |col| %>
         <%= active_scaffold_render_subform_column(col, scope, crud_type, readonly, true, record) %>
       <% end %>

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

@@ -1,5 +1,5 @@
-<%= render :partial => 'messages' unless request.xhr? %>
+<%= render 'messages' unless request.xhr? %>
 
 <% unless @record.nil? %>
-  <%= active_scaffold_error_messages_for :record, :object_name => @record.class.model_name.human.downcase %>
+  <%= active_scaffold_error_messages_for :record, object_name: @record.class.model_name.human.downcase %>
 <% end %>

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

@@ -1,12 +1,13 @@
-<table id="<%= sub_form_list_id(association: column.name, id: parent_record&.id || generated_id(parent_record) || 99999999999) %>">
+<table 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]) %>">
 <%
-  header_record_class = (show_blank_record && show_blank_record.class) || column.association.klass
+  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 partial: 'horizontal_subform_header', :locals => {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] %>
 
-  <%= 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 %>
+  <%= 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 %>
   <tfoot>
-    <%= render :partial => 'horizontal_subform_footer', :locals => {:scope => scope, :parent_record => parent_record, :column => column} %>
+    <%= render 'horizontal_subform_footer', scope: scope, parent_record: parent_record, column: column %>
   </tfoot>
 </table>

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

@@ -1,3 +1,3 @@
-<%= columns.collect {|column| active_scaffold_human_condition_for(column)}.compact.to_sentence  %>
-<%= tag(:br) if columns.present? && grouped_search? %>
+<%= columns.filter_map { |column| active_scaffold_human_condition_for(column) }.to_sentence  %>
+<%= tag.br if columns.present? && grouped_search? %>
 <%= as_(:grouped_by, column: active_scaffold_grouped_by_label) if grouped_search? %>

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

@@ -3,7 +3,14 @@
   <tbody>
     <tr>
       <td class="messages-container">
-        <%= render 'list_messages_content' %>
+        <p class="error-message message server-error" style="display:none;">
+          <%= as_(:internal_error).html_safe %>
+          <span class="error-500"><%= as_(:error_500).html_safe %></span>
+          <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
+        </p>
+        <div id="<%= active_scaffold_messages_id -%>" class="action-messages">
+          <%= render 'messages' %>
+        </div>
       </td>
     </tr>
   </tbody>
@@ -13,19 +20,19 @@
   <thead>
     <tr>
       <% columns = list_columns %>
-      <%= render :partial => 'list_column_headings', :locals => {:columns => columns} %>
+      <%= render 'list_column_headings', columns: columns %>
     </tr>
   </thead>
-  <%= render :partial => 'list_messages', :locals => {:columns => columns} %>
-  <tbody class="records" id="<%= active_scaffold_tbody_id %>" data-refresh-record="<%= url_for(params_for(:action => :index, :id => '--ID--')) %>">
+  <%= render 'list_messages', columns: columns %>
+  <tbody class="records" id="<%= active_scaffold_tbody_id %>" data-refresh-record="<%= url_for(params_for(action: :index, id: '--ID--')) %>">
     <% if !@page.empty? -%>
-      <%= render :partial => list_record_view, :collection => @page.items, :locals => {:hidden => false, :columns => columns, :action_links => active_scaffold_config.action_links.member} %>
+      <%= render partial: 'list_record', collection: @page.items, locals: {hidden: false, columns: columns, action_links: active_scaffold_config.action_links.member} %>
     <% end -%>
   </tbody>
-  <% if columns.any? {|c| c.calculation?} -%>
+  <% if columns.any?(&:calculation?) -%>
   <tfoot>  
-    <%= render :partial => 'list_calculations', :locals => {:columns => columns} %>
+    <%= render 'list_calculations', columns: columns %>
   </tfoot>
   <% end -%>
 </table>
-<%= render :partial => 'list_pagination' %>
+<%= render 'list_pagination' %>

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

@@ -1,9 +1,8 @@
-<% display_class = ( @records.kind_of?(Array) ? @records.first : @records ) 
-   columns ||= list_columns -%>
+<% columns ||= list_columns -%>
 <tr id="<%= active_scaffold_calculations_id %>" class="active-scaffold-calculations">
   <% columns.each do |column| -%>
     <% if column.calculation? %>
-    <td id="<%= active_scaffold_calculations_id(:column => column) %>"><%= render_column_calculation(column) %></td>
+    <td id="<%= active_scaffold_calculations_id(column: column) %>"><%= render_column_calculation(column) %></td>
     <% else %>
     <td>&nbsp;</td>
     <% end -%>

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

@@ -1,6 +1,6 @@
 <% action_links = active_scaffold_config.action_links.collection -%>
 <div class="actions">
-  <%= display_action_links(action_links, nil, :skip_unauthorized => true) unless action_links.empty? %>
-  <%= loading_indicator_tag(:action => :table) %>
+  <%= display_action_links(action_links, nil, skip_unauthorized: true) unless action_links.empty? %>
+  <%= loading_indicator_tag(action: :table) %>
 </div>
 <h2><%= active_scaffold_config.list.user.label %></h2>

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

@@ -1,5 +1,5 @@
 <%# nested_id, allows us to remove a nested scaffold programmatically %>
-<tr class="inline-adapter" id="<%= nested_id = element_row_id action: :nested %>">
+<tr class="inline-adapter" id="<%= element_row_id action: :nested %>">
   <td class="inline-adapter-cell">
 <% if successful? %>
     <div class="<%= "#{params[:action]}-view" if params[:action] %> <%= "#{nested? ? nested.name : id_from_controller(params[:controller])}-view" %> view">
@@ -9,13 +9,13 @@
 <% end %>
     <%= javascript_tag do %>
       setTimeout(function() {
-        var action_link = ActiveScaffold.ActionLink.get('<%= nested_id %>');
+        var action_link = ActiveScaffold.ActionLink.get('<%= element_row_id(action: :nested) %>');
         if (action_link) {
           action_link.update_flash_messages('<%= escape_javascript(render('messages').strip) %>');
-        <% unless successful? %>
+      <% unless successful? %>
           action_link.close();
-          ActiveScaffold.scroll_to(action_link.scaffold(), ActiveScaffold.config.scroll_on_close == "checkInViewport");
-        <% end %>
+          ActiveScaffold.scroll_to(action_link.scaffold(), ActiveScaffold.config.scroll_on_close == 'checkInViewport');
+      <% end %>
         }
       }, 10);
     <% end %>

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

@@ -2,14 +2,23 @@
 <tbody class="messages">
   <tr class="record even-record">
     <td colspan="<%= column_count -%>" class="messages-container">
-      <%= render 'list_messages_content' unless active_scaffold_config.list.messages_above_header %>
+<% unless active_scaffold_config.list.messages_above_header %>
+      <p class="error-message message server-error" style="display:none;">
+        <%= as_(:internal_error).html_safe %>
+        <span class="error-500"><%= as_(:error_500).html_safe %></span>
+        <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
+      </p>
+      <div id="<%= active_scaffold_messages_id -%>" class="action-messages">
+        <%= render 'messages' %>
+      </div>
+<% end %>
       <%= content_tag :div, class: 'filtered-message',
                       style: ('display:none;' unless @filtered),
                       data: ({search: search_params || ''} if active_scaffold_config.store_user_settings && respond_to?(:search_params)) do %>
-        <div><%= @filtered.is_a?(Array) ? render(:partial => 'human_conditions', :locals => {:columns => @filtered}) : as_(active_scaffold_config.list.filtered_message) %></div>
+        <%= @filtered.is_a?(Array) ? render('human_conditions', columns: @filtered) : as_(active_scaffold_config.list.filtered_message) %>
         <% if active_scaffold_config.list.show_search_reset && @filtered -%>
         <div class="reset">
-          <%= loading_indicator_tag(:action => :record, :id => nil) %>
+          <%= loading_indicator_tag(action: :record, id: nil) %>
           <%= render_action_link(active_scaffold_config.list.reset_link) %>
         </div>
         <% end -%>

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

@@ -1,10 +1,10 @@
 <div class="active-scaffold-footer">
 <% if active_scaffold_config.list.pagination != :infinite -%>
-  <div class="active-scaffold-found"><span class="active-scaffold-records"><%= @page.pager.count -%></span> <%=as_(:found, :count => @page.pager.count) %></div>
+  <div class="active-scaffold-found"><span class="active-scaffold-records"><%= @page.pager.count -%></span> <%= as_(:found, count: @page.pager.count) %></div>
 <% end -%>
 <% if active_scaffold_config.list.pagination -%>
-  <div class="active-scaffold-pagination<%= " auto-paginate" if active_scaffold_config.list.auto_pagination %>">
-    <%= render :partial => 'list_pagination_links', :locals => { :current_page => @page } if @page.pager.infinite? || @page.pager.number_of_pages > 1 %>
+  <div class="active-scaffold-pagination<%= ' auto-paginate' if active_scaffold_config.list.auto_pagination %>">
+    <%= render 'list_pagination_links', current_page: @page if @page.pager.infinite? || @page.pager.number_of_pages > 1 %>
   </div>
 <% end -%>
   <br /><!-- to clear this block -->

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

@@ -1,9 +1,9 @@
 <% unless current_page.nil? -%>
   <% url_options = pagination_url_options -%>
-  <% options = {'data-page-history' => controller_id, :remote => true, :method => :get} -%>
+  <% options = {'data-page-history' => controller_id, remote: true, method: :get} -%>
 
-  <%= loading_indicator_tag :action => :pagination %>
-  <%= link_to as_(:previous), url_options.merge(:page => current_page.number - 1), options.merge(:class => "as_paginate previous") if current_page.prev? %>
+  <%= loading_indicator_tag action: :pagination %>
+  <%= link_to as_(:previous), url_options.merge(page: current_page.number - 1), options.merge(class: 'as_paginate previous') if current_page.prev? %>
   <%= pagination_ajax_links current_page, url_options, options, active_scaffold_config.list.page_links_inner_window, active_scaffold_config.list.page_links_outer_window %>
-  <%= link_to as_(:next), url_options.merge(:page => current_page.number + 1), options.merge(:class => "as_paginate next") if current_page.next? %>
+  <%= link_to as_(:next), url_options.merge(page: current_page.number + 1), options.merge(class: 'as_paginate next') if current_page.next? %>
 <% end -%>

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

@@ -1,16 +1,16 @@
 <%
 record = list_record if local_assigns[:list_record] # compat with render :partial :collection
 columns ||= list_columns
-row_id ||= element_row_id(:action => :list, :id => record.id)
-tr_class = "#{cycle("", "even-record")} #{list_row_class(record)}"
+row_id ||= element_row_id(action: :list, id: record.id)
+tr_class = "#{cycle('', 'even-record')} #{list_row_class(record)}"
 action_links ||= active_scaffold_config.action_links.member
 data_refresh ||= record.to_param
 -%>
 <%= content_tag :tr, list_row_attributes(tr_class, row_id, data_refresh) do %>
   <% columns.each do |column| %>
-    <% authorized = record.authorized_for?(:crud_type => :read, :column => column.name) -%>
+    <% authorized = record.authorized_for?(crud_type: :read, column: column.name) -%>
     <% column_value = authorized ? get_column_value(record, column) : empty_field_text -%>
-    <% attrs = column_attributes(column, record).merge(:class => column_class(column, column_value, record)) %>
+    <% attrs = column_attributes(column, record).merge(class: column_class(column, column_value, record)) %>
 
     <%= content_tag :td, authorized ? render_list_column(column_value, column, record) : column_value, attrs %>
   <% end -%>
@@ -19,9 +19,9 @@ data_refresh ||= record.to_param
   <td class="actions"><table>
     <tr>
       <td class="indicator-container">
-        <%= loading_indicator_tag(:action => :record, :id => record.id) %>
+        <%= loading_indicator_tag(action: :record, id: record.id) %>
       </td>
-      <%= display_action_links(action_links, record, :level_0_tag => :td, :for => record.persisted? ? record : record.class) %>
+      <%= display_action_links(action_links, record, level_0_tag: :td, for: record.persisted? ? record : record.class) %>
     </tr>
   </table></td>
   <% end -%>

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

@@ -1,6 +1,6 @@
 <%= content_tag(:div, id: active_scaffold_id, class: as_main_div_class, data: as_main_div_data) do %>
   <div class="active-scaffold-header">
-    <%= render :partial => 'list_header' %>
+    <%= render 'list_header' %>
   </div>
   <table>
     <tbody class="before-header" id="<%= before_header_id -%>">
@@ -9,7 +9,7 @@
         <tr>
           <td>
             <div class="active-scaffold show_search-view <%= "#{id_from_controller params[:controller]}-view" %> view">
-              <%= render :partial => active_scaffold_config.list.search_partial, :locals => {:xhr => true} %>
+              <%= render active_scaffold_config.list.search_partial, xhr: true %>
             </div>
           </td>
         </tr>
@@ -22,7 +22,7 @@
         <tr>
           <td>
             <div  class="active-scaffold create-view <%= "#{id_from_controller params[:controller]}-view" %> view">
-              <%= render :partial => 'create_form_on_list' %>
+              <%= render 'create_form_on_list' %>
             </div>
           </td>
         </tr>
@@ -31,6 +31,6 @@
     </tbody>
   </table>
   <div id="<%= active_scaffold_content_id-%>" class="as_content">
-    <%= render :partial => 'list' %>
+    <%= render 'list' %>
   </div>
 <% end %>

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

@@ -1,4 +1,4 @@
-<% for name in [:info, :warning, :error] %>
+<% for name in %i[info warning error] %>
   <% if flash[name].present? %>
     <div class="<%= "#{name}-message message" %>">
       <%= display_message flash[name] %>

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

@@ -1,6 +1,6 @@
 <% if @auto_pagination -%>
   <% if @page.items.present? -%>
-    ActiveScaffold.append('<%= active_scaffold_tbody_id %>', '<%= escape_javascript(render(:partial => list_record_view, :collection => @page.items, :locals => {:hidden => false, :columns => list_columns, :action_links => active_scaffold_config.action_links.member})) %>');
+    ActiveScaffold.append('<%= active_scaffold_tbody_id %>', '<%= escape_javascript(render(partial: 'list_record', collection: @page.items, locals: {hidden: false, columns: list_columns, action_links: active_scaffold_config.action_links.member})) %>');
 
     <% if @page.pager.infinite? || @page.number < @page.pager.number_of_pages -%>
       ActiveScaffold.auto_load_page('<%= url_for main_path_to_return %>', {auto_pagination: true, page: <%= @page.number + 1 %>});
@@ -17,7 +17,7 @@
     ActiveScaffold.replace_html('<%= active_scaffold_content_id %>', '<%= escape_javascript(render('list')) %>');
 <% end # @auto_pagination -%>
 
-<% if ActiveScaffold.js_framework == :jquery && !@auto_pagination && !@popstate && !embedded? && !local_assigns[:no_history] -%>
+<% 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 %>);
   }