active_scaffold 3.7.12 → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ab6174a908369ed7071d91754c982eb08404643e4fb4df6e8f1a5671ba2671d
-  data.tar.gz: 4dc900e33aeebc279e50d0cf2db26a327c241b84fc4c3cace3a5da981151dba4
+  metadata.gz: 4ecbb34d72c3f80ed59d3e2375baf713458478c1721a7cbbd869fc9f07969b3b
+  data.tar.gz: 5608a6c738c0c00906b693948666324ed69e3de0edd4484d46a74c9974dabe6d
 SHA512:
-  metadata.gz: d4c3ae4876dfcd281c0d1b676c7af0eee264745fbbc3509f400eb54d46bdc2c08e707536eb6753dfe31387a877f5a8929975c20ab017bc7d9e503764f4c6f14c
-  data.tar.gz: 7687567e96978e4a6903a8a6e6e335db842fb1926bb92739c0b2eecb1db19aa5e2c4c4983f285277986fb06d975f6143591e4c26bd24489da40dccbe89709b10
+  metadata.gz: 2197a3ce4b166d648d48afb8530f6bc9d34e3acc64b3a2eb05e09242888093d7298920dcd8ca890bb8c936495e0a743b5d4fc9bd0ccef263a4e02fe331aea770
+  data.tar.gz: 375ce3cda4d6d08ee694b7ccb529a02ddde1e4982e641f15eea47e283e38b435c95a93a48e075174c7cf13d9ac805935e9e270d54909c34e95d5a7c6bdccf50a

data/CHANGELOG.rdoc

@@ -1,26 +1,12 @@
-= 3.7.12
-- Fix using update_columns in field search with search UI submitting a hash, such as date fields
-- Support disabling update_columsns on field_search
-
-= 3.7.11.1
-- Fix action link on association column named record
-
-= 3.7.11
-- Add partial list_messages_content to reduce code duplication, and better support replacing list view with other way to render records
-- Support selector for records body in create_record_row JS method, better support replacing list view with other way to render records
-- Improve detection of member action links when list view is replaced with other structure, based on 'record' html class, instead of tags
-- Support :table position for member action links, replacing the whole table
-- Support changing the view partial used to render a record, default to 'list_record', better support refreshing a record when list view is replaced with other way to render records
-- Support separators in action links
-- Support :popup position, using jquery-ui dialog, but can be replaced with other library overriding ActiveScaffold.open_popup and ActiveScaffold.close_popup JS functions
-- Use column.label in human conditions, same as form
-- Don't overlap 'click to reset' with long human conditions message
-
-= 3.7.10
-- Move code from on_create.js.erb to partials, so it's easier to change parts, e.g. how new record is rendered
-- Don't reload after deleting last record if pagination is disabled
-
-= 3.7.9
+- Add tabbed_by to group of columns in forms. The columns in the group must be collection associations, with a common column or association, used to partition them in different tabs.
+- Fix tableless in rails >= 7.1
+- Stop using cow_proxy for thread safety:
+  - Added ProxyColumn and require using active_scaffold_config.columns.override(:column_name) to change a column per request
+  - Action links can't be changed, added or removed, add all links and use ignore_method to control when they are displayed
+  - Require using active_scaffold_config.override_columns to exclude or add columns
+- Thread safety enabled by default, can't be disabled, deprecate ActiveScaffold.threadsafe!
+
+= 3.7.9 (not released yet)
 - Add css_class to action links, to avoid changing name, it may result confusing, deprecate name setter.
 - Add buttons to check all and uncheck all on :select form ui for collection associations, and draggable lists (active_scaffold_checkbox_list).
 - Add hidden field with locking column in base_form partial for persisted records automatically, if model uses optimistic locking.

data/README.md

@@ -8,14 +8,15 @@ Overview
 [![Inline docs](https://inch-ci.org/github/activescaffold/active_scaffold.svg?branch=master)](https://inch-ci.org/github/activescaffold/active_scaffold)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
-ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails >= 5.2.0 is supported, ruby >= 2.5 required.
+ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails >= 6.1.0 is supported, ruby >= 3.0 required.
 
 Branch Details
 --------------
+master supports rails >= 6.1.x and <= 7.2.x, and ruby >= 3.0.0  
 3-7-stable supports rails >= 5.2.x and <= 7.1.x, and ruby >= 2.5.0
 
 These versions are not supported anymore:  
-3-6-stable supports rails >= 4.2.x and <= 6.1.x, and ruby >= 2.3.0
+3-6-stable supports rails >= 4.2.x and <= 6.1.x, and ruby >= 2.3.0  
 3-5-stable supports rails >= 4.0.x and <= 5.1.x, and ruby >= 2.0.0  
 3-4-stable supports rails >= 3.2.x and <= 4.2.x, and ruby >= 1.9.3  
 3-3-stable supports rails 3.2.x and ruby >= 1.8  

data/app/assets/config/active_scaffold_manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link active_scaffold.scss

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

@@ -1,41 +1,31 @@
 <%
-  case ActiveScaffold.js_framework
-  when :jquery
-    require_asset "getprototypeof"
-    require_asset "jquery.ba-throttle-debounce"
-    if Object.const_defined?('Jquery')
-      if Jquery.const_defined?('Rails') && Jquery::Rails.const_defined?('JQUERY_UI_VERSION')
-        require_asset "jquery-ui"
-      elsif Jquery.const_defined? 'Ui'
-        jquery_ui_prefix = Jquery::Ui::Rails::VERSION < '5.0.0' ? 'jquery.ui.' : 'jquery-ui/'
-        jquery_ui_widgets_prefix = Jquery::Ui::Rails::VERSION >= '6.0.0' ? 'widgets/' : ''
-        require_asset "#{jquery_ui_prefix}core"
-        require_asset "#{jquery_ui_prefix}effect"
-        require_asset "#{jquery_ui_prefix}effects/effect-highlight" if Jquery::Ui::Rails::VERSION >= '6.0.0'
-        require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}sortable"
-        require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}draggable"
-        require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}droppable"
-        require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}datepicker"
-      end
+  require_asset 'jquery.ba-throttle-debounce'
+  if Object.const_defined?(:Jquery)
+    if Jquery.const_defined?(:Rails) && Jquery::Rails.const_defined?(:JQUERY_UI_VERSION)
+      require_asset 'jquery-ui'
+    elsif Jquery.const_defined? :Ui
+      jquery_ui_prefix = Jquery::Ui::Rails::VERSION < '5.0.0' ? 'jquery.ui.' : 'jquery-ui/'
+      jquery_ui_widgets_prefix = Jquery::Ui::Rails::VERSION >= '6.0.0' ? 'widgets/' : ''
+      require_asset "#{jquery_ui_prefix}core"
+      require_asset "#{jquery_ui_prefix}effect"
+      require_asset "#{jquery_ui_prefix}effects/effect-highlight" if Jquery::Ui::Rails::VERSION >= '6.0.0'
+      require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}sortable"
+      require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}draggable"
+      require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}droppable"
+      require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}datepicker"
     end
-    if ActiveScaffold.jquery_ui_included?
-      require_asset "jquery-ui-timepicker-addon"
-      require_asset "jquery/date_picker_bridge"
-      require_asset "jquery/draggable_lists"
-    end
-    require_asset "jquery.visible.min"
-    require_asset "jquery/active_scaffold"
-    require_asset "jquery/jquery.editinplace"
-  when :prototype
-    require_asset "effects"
-    require_asset "controls"
-    require_asset "prototype/active_scaffold"
-    require_asset "prototype/dhtml_history"
-    require_asset "prototype/form_enhancements"
   end
+  if ActiveScaffold.jquery_ui_included?
+    require_asset 'jquery-ui-timepicker-addon'
+    require_asset 'jquery/date_picker_bridge'
+    require_asset 'jquery/draggable_lists'
+  end
+  require_asset 'jquery.visible.min'
+  require_asset 'jquery/active_scaffold'
+  require_asset 'jquery/jquery.editinplace'
 %>
 ActiveScaffold.config = <%= ActiveScaffold.js_config.to_json %>;
 <%
-  ActiveScaffold.javascripts.each {|js| require_asset js}
-  ActiveScaffold::Bridges.all_javascripts.each {|js| require_asset js}
+  ActiveScaffold.javascripts.each { |js| require_asset js }
+  ActiveScaffold::Bridges.all_javascripts.each { |js| require_asset js }
 %>

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

@@ -390,6 +390,16 @@
         form.find('select.as_search_date_time_option').val('BETWEEN');
       });
 
+      jQuery(document).on('click', '.active-scaffold .tabbed .nav-tabs a', function(e) {
+        if (typeof $().tab == 'function') return; // bootstrap tab plugin is loaded and will handle tabs
+        e.preventDefault();
+        var tab_ctrl = jQuery(this), tabbed = tab_ctrl.closest('.tabbed')
+        tabbed.find('.nav-tabs .active').removeClass('active');
+        tabbed.find('.tab-content .active').removeClass('in active');
+        tab_ctrl.closest('li').addClass('active');
+        jQuery(tab_ctrl.attr('href')).addClass('in active');
+      });
+
       jQuery(document).on('turbolinks:before-visit turbo:before-visit', function() {
         if (history.state.active_scaffold) {
           history.replaceState({turbolinks: true, url: document.location.href}, '', document.location.href);
@@ -637,11 +647,6 @@
           jQuery(tbody).parent().find('tbody.messages p.empty-message').hide();
         }
       },
-      show_empty_message: function(tbody) {
-        if (this.records_for(tbody).length != 0) {
-          jQuery(tbody).parent().find('tbody.messages p.empty-message').hide();
-        }
-      },
       reload_if_empty: function(tbody, url) {
         if (this.records_for(tbody).length == 0) {
           this.reload(url);
@@ -790,7 +795,7 @@
 
       create_record_row: function(active_scaffold_id, html, options) {
         if (typeof(active_scaffold_id) == 'string') active_scaffold_id = '#' + active_scaffold_id;
-        var tbody = jQuery(active_scaffold_id).find(options.body_selector || 'tbody.records').first(), new_row;
+        var tbody = jQuery(active_scaffold_id).find('tbody.records').first(), new_row;
 
         if (options.insert_at == 'top') {
           tbody.prepend(html);
@@ -830,10 +835,10 @@
         });
       },
 
-      delete_record_row: function(row, page_reload_url, body_selector) {
+      delete_record_row: function(row, page_reload_url) {
         if (typeof(row) == 'string') row = '#' + row;
         row = jQuery(row);
-        var tbody = row.closest(body_selector || 'tbody.records');
+        var tbody = row.closest('tbody.records');
 
         row.find('a.disabled').each(function() {;
           var action_link = ActiveScaffold.ActionLink.get(this);
@@ -844,7 +849,6 @@
           ActiveScaffold.stripe(tbody);
           ActiveScaffold.decrement_record_count(tbody.closest('div.active-scaffold'));
           if (page_reload_url) ActiveScaffold.reload_if_empty(tbody, page_reload_url);
-          else ActiveScaffold.show_empty_message(tbody);
         });
       },
 
@@ -1219,21 +1223,8 @@
           $footer.removeClass('floating');
           if ($form.visible(true) && !$footer.visible(true)) $footer.addClass('floating');
         });
-      },
-
-      open_popup: function(content, link) {
-        var element = jQuery(content).dialog({
-          modal: true,
-          close: function() { link.close(); },
-          width: ActiveScaffold.config.popup_width || '80%'
-        });
-        link.set_adapter(element);
-      },
-
-      close_popup: function(link, callback) {
-        link.adapter.dialog('close');
-        if (callback) callback();
       }
+
     }
 
 
@@ -1288,15 +1279,18 @@
         if (element.length > 0) {
           element.data(); // $ 1.4.2 workaround
           if (typeof(element.data('action_link')) === 'undefined' && !element.hasClass('as_adapter')) {
-            var parent = element.parent().closest('.record');
-            if (parent.length === 0) parent = element.parent().closest('.actions');
-            if (parent.is('.record')) {
+            var parent = element.closest('.actions');
+            if (parent.length === 0 || parent.is('td')) {
+              // maybe an column action_link
+              parent = element.closest('tr.record');
+            }
+            if (parent.is('tr')) {
               // record action
               var target = parent.find('a.as_action');
-              var loading_indicator = parent.find('.actions .loading-indicator');
+              var loading_indicator = parent.find('td.actions .loading-indicator');
               if (!loading_indicator.length) loading_indicator = element.parent().find('.loading-indicator');
               new ActiveScaffold.Actions.Record(target, parent, loading_indicator);
-            } else if (parent.is('.active-scaffold-header .actions')) {
+            } else if (parent && parent.is('div')) {
               //table action
               new ActiveScaffold.Actions.Table(parent.find('a.as_action'), parent.closest('div.active-scaffold').find('tbody.before-header').first(), parent.find('.loading-indicator').first());
             }
@@ -1333,18 +1327,14 @@
       },
 
       close: function() {
-        var link = this, callback = function() {
-          link.enable();
-          if (link.hide_target) link.target.show();
-          if (link.hide_content) link.content.show();
-          if (ActiveScaffold.config.scroll_on_close) {
-            ActiveScaffold.scroll_to(link.target.attr('id'), ActiveScaffold.config.scroll_on_close === 'checkInViewport');
-          }
-        };
-        if (this.position === 'popup') {
-          ActiveScaffold.close_popup(this, callback);
-        } else if (this.adapter) {
-          ActiveScaffold.remove(this.adapter, callback);
+        if (this.adapter) {
+          var link = this;
+          ActiveScaffold.remove(this.adapter, function() {
+            link.enable();
+            if (link.hide_target) link.target.show();
+            if (link.hide_content) link.content.show();
+            if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(link.target.attr('id'), ActiveScaffold.config.scroll_on_close == 'checkInViewport');
+          });
         }
       },
 
@@ -1405,7 +1395,7 @@
         if (refresh) l.refresh_url = this.target.closest('.records').data('refresh-record').replace('--ID--', refresh);
 
         if (l.position) {
-          l.url = l.url.append_params({adapter: l.position == 'popup' ? '_popup_adapter' : '_list_inline_adapter'});
+          l.url = l.url.append_params({adapter: '_list_inline_adapter'});
           l.tag.attr('href', l.url);
         }
         l.set = this;
@@ -1426,13 +1416,9 @@
       insert: function(content) {
         this.close_previous_adapter();
 
-        if (this.position === 'replace') {
+        if (this.position == 'replace') {
           this.position = 'after';
           this.hide_target = true;
-        } else if (this.position === 'table') {
-          this.hide_content = true;
-        } else if (this.position === 'popup') {
-          return ActiveScaffold.open_popup(content, this);
         }
 
         var colspan = this.target.children().length;
@@ -1440,17 +1426,15 @@
           content = jQuery(content);
           content.find('.inline-adapter-cell:first').attr('colspan', colspan);
         }
-        if (this.position === 'after') {
+        if (this.position == 'after') {
           this.target.after(content);
           this.set_adapter(this.target.next());
-        } else if (this.position === 'before') {
+        }
+        else if (this.position == 'before') {
           this.target.before(content);
           this.set_adapter(this.target.prev());
-        } else if (this.position === 'table') {
-          var content_parent = this.target.closest('div.active-scaffold').find('tbody.before-header').first()
-          content_parent.prepend(content);
-          this.set_adapter(content_parent.children().first())
-        } else {
+        }
+        else {
           return false;
         }
         ActiveScaffold.highlight(this.adapter.find('td'));
@@ -1488,10 +1472,10 @@
       },
 
       set_opened: function() {
-        if (this.position === 'after') {
+        if (this.position == 'after') {
           this.set_adapter(this.target.next());
         }
-        else if (this.position === 'before') {
+        else if (this.position == 'before') {
           this.set_adapter(this.target.prev());
         }
         this.disable();
@@ -1517,14 +1501,13 @@
         if (this.position == 'replace') {
           this.position = 'top';
           this.hide_content = true;
-        } else if (this.position == 'popup') {
-          return ActiveScaffold.open_popup(content, this);
         }
 
         if (this.position == 'top') {
           this.target.prepend(content);
           this.set_adapter(this.target.children().first());
-        } else {
+        }
+        else {
           throw 'Unknown position "' + this.position + '"'
         }
         ActiveScaffold.highlight(this.adapter.find('td').first().children().not('script'));

data/app/assets/javascripts/jquery/date_picker_bridge.js.erb

@@ -1,5 +1,5 @@
 <%# encoding: utf-8 %>
-<% I18n.available_locales.each { |locale| Dir[Rails.root.join("config/locales/#{locale}.*")].each { |path| depend_on path } } %>
+<% I18n.available_locales.each { |locale| Rails.root.glob("config/locales/#{locale}.*").each { |path| depend_on path.to_s } } %>
 <%= ActiveScaffold::Bridges[:date_picker].localization %>
 Object.getPrototypeOf(jQuery.datepicker)._attachDatepicker_without_inlineSettings = Object.getPrototypeOf(jQuery.datepicker)._attachDatepicker;
 jQuery.extend(Object.getPrototypeOf(jQuery.datepicker), {

data/app/assets/stylesheets/active_scaffold_colors.scss

@@ -110,9 +110,6 @@ color: $column_color;
 color: $header_color;
 }
 
-.active-scaffold div.actions a.separator {
-border-color: $action_group_border_color;
-}
 .active-scaffold-header div.actions a.disabled {
 color: $actions_disabled_color;
 }
@@ -194,10 +191,6 @@ color: $column_empty_color;
 border-color: $column_actions_border_color;
 }
 
-.active-scaffold tr.record td.actions table td.separator {
-border-color: $column_actions_border_color;
-}
-
 .active-scaffold tr.record td.actions a.disabled {
 color: $actions_disabled_color;
 }

data/app/assets/stylesheets/active_scaffold_extensions.css.erb

@@ -1,2 +1,2 @@
-<% ActiveScaffold.stylesheets.each {|css| require_asset css} %>
-<% ActiveScaffold::Bridges.all_stylesheets.each {|css| require_asset css} %>
+<% ActiveScaffold.stylesheets.each { |css| require_asset css } %>
+<% ActiveScaffold::Bridges.all_stylesheets.each { |css| require_asset css } %>

data/app/assets/stylesheets/active_scaffold_jquery_ui.css.erb

@@ -1,12 +1,12 @@
-<% if Object.const_defined?('Jquery') %>
-  <% if Jquery.const_defined?('Rails') && Jquery::Rails.const_defined?('JQUERY_UI_VERSION') %>
-    <% require_asset "jquery-ui" %>
-  <% elsif Jquery.const_defined? 'Ui' %>
+<% if Object.const_defined?(:Jquery) %>
+  <% if Jquery.const_defined?(:Rails) && Jquery::Rails.const_defined?(:JQUERY_UI_VERSION) %>
+    <% require_asset 'jquery-ui' %>
+  <% elsif Jquery.const_defined? :Ui %>
     <% if Jquery::Ui::Rails::VERSION < '5.0.0' %>
-      <% require_asset "jquery.ui.datepicker" %>
+      <% require_asset 'jquery.ui.datepicker' %>
     <% else %>
-      <% require_asset "jquery-ui/datepicker" %>
+      <% require_asset 'jquery-ui/datepicker' %>
     <% end %>
   <% end %>
 <% end %>
-<% require_asset "jquery-ui-theme" if ActiveScaffold.jquery_ui_included? %>
+<% require_asset 'jquery-ui-theme' if ActiveScaffold.jquery_ui_included? %>

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -110,12 +110,6 @@ top: 14px;
 top: -3px;
 }
 
-.active-scaffold div.actions a.separator {
-  border-right: 1px solid;
-  padding-right: 0;
-  padding-left: 0;
-}
-
 .active-scaffold div.actions a.disabled {
 opacity: 0.5;
 }
@@ -257,11 +251,6 @@ text-align: right;
 padding: 0 2px;
 }
 
-.active-scaffold tr.record td.actions table td.separator {
-  border-right: solid 1px;
-  padding: 0;
-}
-
 .active-scaffold tr.record td.actions a,
 .active-scaffold tr.record td.actions div {
 font-weight: bold;
@@ -315,16 +304,6 @@ width: auto;
 text-align: left;
 }
 
-.active-scaffold .actions .action_group ul li.separator {
-  border-top-width: 1px;
-  border-top-style: solid;
-  height: 0;
-}
-
-.active-scaffold .actions .action_group ul li.separator + li {
-  border-top: none;
-}
-
 .active-scaffold .actions .action_group ul li div {
   margin: 0;
   padding: 5px 5px 5px 25px;
@@ -497,12 +476,6 @@ padding: 4px;
 text-align: center;
 position: relative;
 }
-.active-scaffold .filtered-message {
-  display: flex;
-}
-.active-scaffold .filtered-message > * {
-  flex-grow: 1;
-}
 
 .active-scaffold .message, .active-scaffold-component .message {
 font-size: 11px;
@@ -518,9 +491,10 @@ display: inline;
 }
 
 .active-scaffold .filtered-message .reset {
-margin-right: 5px;
-white-space: nowrap;
-flex-grow: 0;
+position: absolute;
+display: inline;
+right: 10px;
+top: 4px;
 padding: 0;
 }
 
@@ -1005,6 +979,59 @@ font-size: 100%;
   margin-right: 5px;
 }
 
+.active-scaffold .tabbed .nav-tabs {
+  border-bottom: 1px solid #ddd;
+  padding-left: 0;
+  margin-bottom: 0;
+  list-style: none;
+}
+
+.active-scaffold .tabbed .nav-tabs:before,
+.active-scaffold .tabbed .nav-tabs:after {
+  display: table;
+  content: ' ';
+}
+.active-scaffold .tabbed .nav-tabs:after {
+  clear: both;
+}
+
+.active-scaffold .tabbed .nav-tabs > li {
+  float: left;
+  margin-bottom: -1px;
+  position: relative;
+  display: block;
+}
+
+.active-scaffold .tabbed .nav-tabs > li > a {
+  margin-right: 2px;
+  border: 1px solid transparent;
+  border-radius: 4px 4px 0 0;
+  position: relative;
+  display: block;
+  padding: 10px 15px;
+}
+.active-scaffold .tabbed .nav-tabs > li > a:focus,
+.active-scaffold .tabbed .nav-tabs > li > a:hover {
+  border-color: #eee #eee #ddd;
+  text-decoration: none;
+  background-color: #eee;
+}
+.active-scaffold .tabbed .nav-tabs > li.active > a,
+.active-scaffold .tabbed .nav-tabs > li.active > a:focus,
+.active-scaffold .tabbed .nav-tabs > li.active > a:hover {
+  border-color: #ddd;
+  border-bottom-color: transparent;
+  cursor: default;
+  background-color: #fff;
+}
+
+.active-scaffold .tabbed .tab-content > .tab-pane {
+  display: none;
+}
+.active-scaffold .tabbed .tab-content > .active {
+  display: block;
+}
+
 .as_touch a.inline-adapter-close {
 width: 25px;
 height: 27px;

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

@@ -1,9 +1,9 @@
-<% url_options = params_for(:action => :add_existing) -%>
+<% url_options = params_for(action: :add_existing) -%>
 <% xhr = request.xhr? -%>
 <%=
-options = {:id => element_form_id(:action => :add_existing),
-           :class => "as_form create",
-           :method => :post,
+options = {id: element_form_id(action: :add_existing),
+           class: 'as_form create',
+           method: :post,
            'data-loading' => true}
   options[:remote] = true if xhr
   form_tag url_options, options -%>
@@ -11,18 +11,18 @@ options = {:id => element_form_id(:action => :add_existing),
   <h4><%= active_scaffold_config.nested.label -%></h4>
 
   <% if xhr -%>
-    <div id="<%= element_messages_id(:action => :add_existing) %>" class="messages-container"></div>
+    <div id="<%= element_messages_id(action: :add_existing) %>" class="messages-container"></div>
   <% else -%>
-    <%= render :partial => 'form_messages' %>
+    <%= render 'form_messages' %>
   <% end -%>
 
   <label for="<%= "record_#{active_scaffold_config.model}" %>"><%= active_scaffold_add_existing_label %></label>
-  <%= active_scaffold_add_existing_input(:name => 'associated_id', :url_options => url_options, :object => nested_parent_record) %>
+  <%= active_scaffold_add_existing_input(name: 'associated_id', url_options: url_options, object: nested_parent_record) %>
 
   <p class="form-footer">
-    <%= submit_tag as_(:add), :class => "submit" %>
-    <%= link_to as_(:cancel), main_path_to_return, :class => 'as_cancel', :remote => true %>
-    <%= loading_indicator_tag(:action => :add_existing, :id => params[:id]) %>
+    <%= submit_tag as_(:add), class: 'submit' %>
+    <%= link_to as_(:cancel), main_path_to_return, class: 'as_cancel', remote: true %>
+    <%= loading_indicator_tag(action: :add_existing, id: params[:id]) %>
   </p>
 
 </form>

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

@@ -1,17 +1,17 @@
 <% scope ||= nil
    footer_extension ||= nil
-   url_options ||= params_for(:action => form_action)
+   url_options ||= params_for(action: form_action)
    xhr = request.xhr? if xhr.nil?
    if active_scaffold_config.actions.include? form_action
      action_config = active_scaffold_config.send(form_action)
-     multipart ||= action_config.multipart? unless local_assigns.has_key? :multipart
-     columns ||= action_config.columns unless local_assigns.has_key? :columns
-     persistent ||= action_config.persistent unless local_assigns.has_key? :persistent
-     unless local_assigns.has_key? :floating_footer
-       floating_footer = action_config.floating_footer if action_config.respond_to? :floating_footer
+     multipart ||= action_config.multipart? unless local_assigns.key? :multipart
+     columns ||= action_config.columns unless local_assigns.key? :columns
+     persistent ||= action_config.persistent unless local_assigns.key? :persistent
+     if !local_assigns.key?(:floating_footer) && action_config.respond_to?(:floating_footer)
+       floating_footer = action_config.floating_footer
      end
-     unless local_assigns.has_key? :add_locking_column
-       add_locking_column = action_config.add_locking_column if action_config.respond_to? :add_locking_column
+     if !local_assigns.key?(:add_locking_column) && action_config.respond_to?(:add_locking_column)
+       add_locking_column = action_config.add_locking_column
      end
    else
      multipart ||= false
@@ -27,16 +27,16 @@
    form_id = element_form_id(action: form_action, id: @record&.id)
 %>
 <%=
-options = {:id => form_id,
-           :multipart => multipart,
-           :class => "as_form #{form_action.to_s}",
-           :method => method,
+options = {id: form_id,
+           multipart: multipart,
+           class: "as_form #{form_action}",
+           method: method,
            'data-loading' => defined?(loading) ? loading : true}
-cancel_options = {:class => 'as_cancel'}
+cancel_options = {class: 'as_cancel'}
 options[:class] << ' floating-footer' if floating_footer
-cancel_options[:remote] = true if xhr #cancel link does nt have to care about multipart forms
+cancel_options[:remote] = true if xhr # cancel link does nt have to care about multipart forms
 if xhr && multipart # file_uploads
-  form_remote_upload_tag url_options.merge({:iframe => true}), options
+  form_remote_upload_tag url_options.merge(iframe: true), options
 else
   options[:remote] = true if xhr && !multipart
   form_tag url_options, options
@@ -45,24 +45,24 @@ end
   <%= hidden_field :record, @record.class.locking_column if add_locking_column && @record.persisted? && @record.locking_enabled? %>
   <h4><%= headline -%></h4>
 
-  <div id="<%= element_messages_id(:action => form_action) %>" class="messages-container">
+  <div id="<%= element_messages_id(action: form_action) %>" class="messages-container">
     <% unless xhr %>
       <p class="error-message message server-error" style="display:none;">
         <%= as_(:internal_error).html_safe %>
         <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
       </p>
     <% end %>
-    <%= render :partial => 'form_messages' %>
+    <%= render 'form_messages' %>
   </div>
 
-  <%= render :partial => body_partial, :locals => { :columns => columns, :form_action => form_action, :scope => scope } %>
+  <%= render body_partial, columns: columns, form_action: form_action, scope: scope %>
 
   <p class="form-footer">
-    <%= submit_tag as_(submit_text), :class => "submit" if !persistent || persistent == :optional %>
-    <%= submit_tag as_(apply_text), :class => "submit", :name => 'dont_close' if persistent %>
+    <%= submit_tag as_(submit_text), class: 'submit' if !persistent || persistent == :optional %>
+    <%= submit_tag as_(apply_text), class: 'submit', name: 'dont_close' if persistent %>
     <%= link_to(as_(:cancel), main_path_to_return, cancel_options) if cancel_link %>
     <%= loading_indicator_tag(action: form_action, id: @record&.id) %>
-    <%= render :partial => footer_extension, :locals => { :form_action => form_action } if footer_extension %>
+    <%= render footer_extension, form_action: form_action if footer_extension %>
   </p>
 
 </form>