active_scaffold 3.7.10 → 3.7.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cf15686cc7fb67b4b58b015fa13c13e905f84d4842706c5c61a908172ad5cf6
-  data.tar.gz: e5a12dabc7495c540becf66a4d17cf248dce91d8745d7055dc449d2894e63237
+  metadata.gz: d5d2e7260966fbf6c4232d7a9750ccde96ba04bc234b770aedd47f934ac5274d
+  data.tar.gz: 4b8d78f9e17a958ea0cf6486c5ea913a3afda356fe0fbefdcb1acce76e175e11
 SHA512:
-  metadata.gz: 2f5d694e309c6925491b347ec2f28061af1a0107b70caad1fbc3aa575e15d6d53137a5aa1a52f61f7bda9d5bb6b8d8880c461bb2b06d264001911bb7de59295f
-  data.tar.gz: c344f0f8e5e1461d5f73677a1297bc21a614a248d787a89c8045cf58deebe8741558be2058b5742e81fb491cb379f28ce5762740555ebd49dc1ec4ae5929fce5
+  metadata.gz: 2b1634e907a0e0a2baae5dff8c6c4ca468f2684bf7c880a7d5413594c2cb06d12e2e5a9b8e53029b7492ca28d598f0db4e9c821c9bdcda818969e6ff5f13b892
+  data.tar.gz: 622b7f77b49a1cae067296a11df2e9fb93adb7ba8efceeafa9530cbb3cc1b9ed1f84ac8210ea323203fefc521f1a0fb76c58c613cedba6a2c0ea91471844c389

data/CHANGELOG.rdoc

@@ -1,3 +1,17 @@
+= 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

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

@@ -790,7 +790,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('tbody.records').first(), new_row;
+        var tbody = jQuery(active_scaffold_id).find(options.body_selector || 'tbody.records').first(), new_row;
 
         if (options.insert_at == 'top') {
           tbody.prepend(html);
@@ -830,10 +830,10 @@
         });
       },
 
-      delete_record_row: function(row, page_reload_url) {
+      delete_record_row: function(row, page_reload_url, body_selector) {
         if (typeof(row) == 'string') row = '#' + row;
         row = jQuery(row);
-        var tbody = row.closest('tbody.records');
+        var tbody = row.closest(body_selector || 'tbody.records');
 
         row.find('a.disabled').each(function() {;
           var action_link = ActiveScaffold.ActionLink.get(this);
@@ -1219,8 +1219,21 @@
           $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();
+      }
     }
 
 
@@ -1275,18 +1288,15 @@
         if (element.length > 0) {
           element.data(); // $ 1.4.2 workaround
           if (typeof(element.data('action_link')) === 'undefined' && !element.hasClass('as_adapter')) {
-            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')) {
+            var parent = element.parent().closest('.record');
+            if (parent.length === 0) parent = element.parent().closest('.actions');
+            if (parent.is('.record')) {
               // record action
               var target = parent.find('a.as_action');
-              var loading_indicator = parent.find('td.actions .loading-indicator');
+              var loading_indicator = parent.find('.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 && parent.is('div')) {
+            } else if (parent.is('.active-scaffold-header .actions')) {
               //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());
             }
@@ -1323,14 +1333,18 @@
       },
 
       close: function() {
-        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');
-          });
+        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);
         }
       },
 
@@ -1391,7 +1405,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: '_list_inline_adapter'});
+          l.url = l.url.append_params({adapter: l.position == 'popup' ? '_popup_adapter' : '_list_inline_adapter'});
           l.tag.attr('href', l.url);
         }
         l.set = this;
@@ -1412,9 +1426,13 @@
       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;
@@ -1422,15 +1440,17 @@
           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 {
+        } 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 {
           return false;
         }
         ActiveScaffold.highlight(this.adapter.find('td'));
@@ -1468,10 +1488,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();
@@ -1497,13 +1517,14 @@
         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/stylesheets/active_scaffold_colors.scss

@@ -110,6 +110,9 @@ 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;
 }
@@ -191,6 +194,10 @@ 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_layout.css

@@ -110,6 +110,12 @@ 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;
 }
@@ -251,6 +257,11 @@ 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;
@@ -304,6 +315,16 @@ 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;
@@ -476,6 +497,12 @@ 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;
@@ -491,10 +518,9 @@ display: inline;
 }
 
 .active-scaffold .filtered-message .reset {
-position: absolute;
-display: inline;
-right: 10px;
-top: 4px;
+margin-right: 5px;
+white-space: nowrap;
+flex-grow: 0;
 padding: 0;
 }
 

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

@@ -3,14 +3,7 @@
   <tbody>
     <tr>
       <td class="messages-container">
-        <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 :partial => 'messages' %>
-        </div>
+        <%= render 'list_messages_content' %>
       </td>
     </tr>
   </tbody>
@@ -26,7 +19,7 @@
   <%= 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--')) %>">
     <% if !@page.empty? -%>
-      <%= render :partial => 'list_record', :collection => @page.items, :locals => {:hidden => false, :columns => columns, :action_links => active_scaffold_config.action_links.member} %>
+      <%= render :partial => list_record_view, :collection => @page.items, :locals => {:hidden => false, :columns => columns, :action_links => active_scaffold_config.action_links.member} %>
     <% end -%>
   </tbody>
   <% if columns.any? {|c| c.calculation?} -%>

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

@@ -1,12 +1,23 @@
 <%# nested_id, allows us to remove a nested scaffold programmatically %>
-<tr class="inline-adapter" id="<%= element_row_id :action => :nested %>">
+<tr class="inline-adapter" id="<%= nested_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">
-      <%= link_to(as_(:close), '', :class => 'inline-adapter-close as_cancel', :remote => true, :title => as_(:close)) -%>
+      <%= link_to(as_(:close), '', class: 'inline-adapter-close as_cancel', remote: true, title: as_(:close)) -%>
       <%= payload -%>
     </div>
 <% end %>
-    <%= javascript_tag("setTimeout(function() { var action_link = ActiveScaffold.ActionLink.get('#{element_row_id(:action => :nested)}'); if (action_link) { action_link.update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');#{' action_link.close(); ActiveScaffold.scroll_to(action_link.scaffold(), ActiveScaffold.config.scroll_on_close == "checkInViewport");' unless successful?} } }, 10);") %>
+    <%= javascript_tag do %>
+      setTimeout(function() {
+        var action_link = ActiveScaffold.ActionLink.get('<%= nested_id %>');
+        if (action_link) {
+          action_link.update_flash_messages('<%= escape_javascript(render('messages').strip) %>');
+        <% unless successful? %>
+          action_link.close();
+          ActiveScaffold.scroll_to(action_link.scaffold(), ActiveScaffold.config.scroll_on_close == "checkInViewport");
+        <% end %>
+        }
+      }, 10);
+    <% end %>
   </td>
 </tr>

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

@@ -2,20 +2,11 @@
 <tbody class="messages">
   <tr class="record even-record">
     <td colspan="<%= column_count -%>" class="messages-container">
-<% 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 :partial => 'messages' %>
-      </div>
-<% end %>
+      <%= render 'list_messages_content' unless active_scaffold_config.list.messages_above_header %>
       <%= 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 %>
-        <%= @filtered.is_a?(Array) ? render(:partial => 'human_conditions', :locals => {:columns => @filtered}) : as_(active_scaffold_config.list.filtered_message) %>
+        <div><%= @filtered.is_a?(Array) ? render(:partial => 'human_conditions', :locals => {:columns => @filtered}) : as_(active_scaffold_config.list.filtered_message) %></div>
         <% if active_scaffold_config.list.show_search_reset && @filtered -%>
         <div class="reset">
           <%= loading_indicator_tag(:action => :record, :id => nil) %>

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

@@ -0,0 +1,8 @@
+<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>

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

@@ -9,7 +9,7 @@
 <% 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 %>
+  <% new_row = render list_record_view, record: @saved_record || @record %>
   ActiveScaffold.create_record_row(action_link ? action_link.scaffold() : '<%= active_scaffold_id %>', '<%= escape_javascript(new_row) %>', <%= {insert_at: insert_at}.to_json.html_safe %>);
   <%= render 'update_calculations' %>
 <% end %>

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

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

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', :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_view, :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 %>});

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

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

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

@@ -1,4 +1,4 @@
-<% new_row = render :partial => 'list_record', :locals => {:record => @record} %>
+<% 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 %>);
 
 <%= render :partial => 'update_calculations', :formats => [:js] %>

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

@@ -5,7 +5,7 @@ link = ActiveScaffold.find_action_link('<%= element_form_id(:action => action_na
 <% if successful? %>
   <% if @record %>
     <%= render :partial => 'update_messages' %>
-    <% row = escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) -%>
+    <% row = escape_javascript(render(:partial => list_record_view, :locals => {:record => @record})) -%>
     <% if @action_link&.position %>
 if (link) link.close('<%= row %>');
     <% else %>

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

@@ -5,7 +5,7 @@ if (action_link) action_link.update_flash_messages('<%= escape_javascript(render
 <% 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', :locals => {:record => @record})) %>');
+    ActiveScaffold.update_row('<%= row_selector %>', '<%= escape_javascript(render(:partial => list_record_view, :locals => {:record => @record})) %>');
     if (action_link) action_link.target = $('#<%= row_selector %>');
     <%= render :partial => 'update_calculations', :formats => [:js] %>
     <% if params[:iframe] == 'true' %>
@@ -22,7 +22,7 @@ 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', :locals => {:record => @record})) %>');
+      if (action_link) action_link.close('<%= escape_javascript(render(:partial => list_record_view, :locals => {:record => @record})) %>');
       <% else %>
       if (action_link) action_link.close();
       ActiveScaffold.delete_record_row('<%= element_row_id(:action => :list, :id => params[:id]) %>');

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', record: @record) %>');
+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] %>

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

@@ -1 +1 @@
-ActiveScaffold.update_row('<%=element_row_id(:action => 'list', :id => @record.id)%>','<%=escape_javascript(render(:partial => 'list_record', :locals => {:record => @record}))%>');
+ActiveScaffold.update_row('<%=element_row_id(:action => 'list', :id => @record.id)%>','<%=escape_javascript(render(:partial => list_record_view, :locals => {:record => @record}))%>');

data/lib/active_scaffold/data_structures/action_link.rb

@@ -182,12 +182,15 @@ module ActiveScaffold::DataStructures
     # where the result of this action should insert in the display.
     # for :type => :collection, supported values are:
     #   :top
-    #   :replace (for updating the entire table)
+    #   :replace (to hide the entire table)
+    #   :popup (popup with JS library)
     #   false (no attempt at positioning)
     # for :type => :member, supported values are:
     #   :before
-    #   :replace
+    #   :replace (to hide the record row)
     #   :after
+    #   :table (to hide the entire table)
+    #   :popup (popup with JS library)
     #   false (no attempt at positioning)
     attr_writer :position
     def position

data/lib/active_scaffold/data_structures/action_link_separator.rb

@@ -0,0 +1,13 @@
+class ActionLinkSeparator
+  def initialize(weight)
+    @weight = weight
+  end
+
+  attr_reader :weight
+
+  def ==(other)
+    other == :separator
+  end
+
+  def name_to_cache; end # :nodoc:
+end

data/lib/active_scaffold/data_structures/action_links.rb

@@ -34,6 +34,12 @@ module ActiveScaffold::DataStructures
     end
     alias << add
 
+    def add_separator(weight = 0)
+      raise 'Call add_separator on a group' if name == :root
+
+      add_to_set ActionLinkSeparator.new(weight)
+    end
+
     def add_to_set(link)
       @set << link
     end
@@ -51,6 +57,8 @@ module ActiveScaffold::DataStructures
     def [](val)
       links = []
       @set.each do |item|
+        next if item == :separator
+
         if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
           collected = item[val]
           links << collected unless collected.nil?
@@ -64,6 +72,8 @@ module ActiveScaffold::DataStructures
     def find_duplicate(link)
       links = []
       @set.each do |item|
+        next if item == :separator
+
         if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
           collected = item.find_duplicate(link)
           links << collected unless collected.nil?
@@ -75,7 +85,9 @@ module ActiveScaffold::DataStructures
     end
 
     def delete(val)
-      each(:include_set => true) do |link, set|
+      each(include_set: true) do |link, set|
+        next if link == :separator
+
         if link.action.to_s == val.to_s
           set.delete link
           break
@@ -109,12 +121,6 @@ module ActiveScaffold::DataStructures
       end
     end
 
-    def collect_by_type(type = nil)
-      links = []
-      subgroup(type).each(type) { |link| links << link }
-      links
-    end
-
     def collect
       @set
     end
@@ -171,9 +177,9 @@ module ActiveScaffold::DataStructures
     attr_accessor :css_class
 
     def name=(value)
-      ActiveSupport::Deprecation.warn 'Changing name is deprecated, use css_class to change the class html attribute'
       self.css_class = value
     end
+    ActiveScaffold.deprecator.deprecate_methods(self, :name= => :css_class=)
 
     protected
 

data/lib/active_scaffold/helpers/action_link_helpers.rb

@@ -35,32 +35,49 @@ module ActiveScaffold
         options[:level] ||= 0
         options[:first_action] = true
         output = ActiveSupport::SafeBuffer.new
+        prev_link = separator = nil
 
-        action_links.each(:reverse => options.delete(:reverse), :groups => true) do |link|
+        action_links.each(reverse: options.delete(:reverse), groups: true) do |link|
+          if link == :separator
+            separator = true if prev_link
+            next
+          end
+          content = nil
           if link.is_a? ActiveScaffold::DataStructures::ActionLinks
-            unless link.empty?
-              options[:level] += 1
-              content = display_action_links(link, record, options, &block)
-              options[:level] -= 1
-              if content.present?
-                output << display_action_link(link, content, record, options)
-                options[:first_action] = false
-              end
-            end
+            content = display_action_link_group(link, record, options, &block) unless link.empty?
           elsif !skip_action_link?(link, *Array(options[:for]))
             authorized, reason = action_link_authorized?(link, *Array(options[:for]))
             next if !authorized && options[:skip_unauthorized]
-            output << display_action_link(link, nil, record, options.merge(:authorized => authorized, :not_authorized_reason => reason))
+
+            content = display_action_link(link, nil, record, options.merge(authorized: authorized, not_authorized_reason: reason))
             options[:first_action] = false
           end
+          next if content.blank?
+
+          prev_link = true
+          output << display_action_link_separator(options) if separator
+          output << content
+          separator = false
         end
         output
       end
 
+      def display_action_link_group(link, record, options, &block)
+        options[:level] += 1
+        content = display_action_links(link, record, options, &block)
+        options[:level] -= 1
+        display_action_link(link, content, record, options).tap { options[:first_action] = false } if content.present?
+      end
+
+      def display_action_link_separator(options)
+        tag = options[:level_0_tag] || :a if options[:level].zero?
+        content_tag(tag || :li, '&nbsp;'.html_safe, class: 'separator') # rubocop:disable Rails/OutputSafety
+      end
+
       def display_action_link(link, content, record, options)
         if content
           html_classes = hover_via_click? ? 'hover_click ' : ''
-          if (options[:level]).zero?
+          if options[:level].zero?
             html_classes << 'action_group'
             group_tag = :div
           else
@@ -72,9 +89,9 @@ module ActiveScaffold
           end
         else
           content = render_action_link(link, record, options)
-          content = content_tag(:li, content, :class => ('top' if options[:first_action])) unless (options[:level]).zero?
+          content = content_tag(:li, content, class: ('top' if options[:first_action])) unless options[:level].zero?
         end
-        content = content_tag(options[:level_0_tag], content, options[:options_level_0_tag]) if (options[:level]).zero? && options[:level_0_tag]
+        content = content_tag(options[:level_0_tag], content, options[:options_level_0_tag]) if options[:level].zero? && options[:level_0_tag]
         content
       end
 

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -23,7 +23,7 @@ module ActiveScaffold
       end
 
       def format_human_condition(column, opt, from = nil, to = nil)
-        attribute = column.active_record_class.human_attribute_name(column.name)
+        attribute = column.label
         opt ||= :between if from && to
         opt ||= from ? '>=' : '<='
         from = to = nil if opt&.in? %w[null not_null]
@@ -51,15 +51,15 @@ module ActiveScaffold
           range_type, range = value['range'].downcase.split('_')
           format = active_scaffold_human_condition_datetime_range_format(range_type, range)
           from, = controller.class.datetime_from_to(column, value)
-          "#{column.active_record_class.human_attribute_name(column.name)} = #{as_(value['range'].downcase).downcase} (#{I18n.l(from, :format => format)})"
-        when 'PAST', 'FUTURE'
+          "#{column.label} = #{as_(value['range'].downcase).downcase} (#{I18n.l(from, :format => format)})"
+        when 'PAST', 'FUTURE', 'BETWEEN'
           from, to = controller.class.datetime_from_to(column, value)
-          "#{column.active_record_class.human_attribute_name(column.name)} #{as_('BETWEEN'.downcase).downcase} #{I18n.l(from)} - #{I18n.l(to)}"
+          "#{column.label} #{as_('between').downcase} #{I18n.l(from)} - #{I18n.l(to)}"
         when 'null', 'not_null'
-          "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value['opt'].downcase).downcase}"
+          "#{column.label} #{as_(value['opt'].downcase).downcase}"
         else
-          from, to = controller.class.datetime_from_to(column, value)
-          "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value['opt'].downcase).downcase} #{I18n.l(from)} #{value['opt'] == 'BETWEEN' ? '- ' + I18n.l(to) : ''}"
+          from, = controller.class.datetime_from_to(column, value)
+          "#{column.label} #{as_(value['opt'].downcase).downcase} #{I18n.l(from)}"
         end
       end
       alias active_scaffold_human_condition_time active_scaffold_human_condition_datetime
@@ -93,7 +93,7 @@ module ActiveScaffold
       # end
 
       def active_scaffold_human_condition_boolean(column, value)
-        attribute = column.active_record_class.human_attribute_name(column.name)
+        attribute = column.label
         as_(:boolean, :scope => :human_conditions, :column => attribute, :value => as_(value))
       end
       alias active_scaffold_human_condition_checkbox active_scaffold_human_condition_boolean
@@ -103,7 +103,7 @@ module ActiveScaffold
       end
 
       def active_scaffold_human_condition_select(column, associated)
-        attribute = column.active_record_class.human_attribute_name(column.name)
+        attribute = column.label
         if associated.is_a?(Hash)
           return active_scaffold_human_condition_range(column, associated) unless associated['opt'] == '='
           associated = associated['from']

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -2,6 +2,10 @@ module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a List Column
     module ListColumnHelpers
+      def list_record_view
+        'list_record'
+      end
+
       def get_column_value(record, column)
         record = record.send(column.delegated_association.name) if column.delegated_association
         if record

data/lib/active_scaffold/version.rb

@@ -2,8 +2,8 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 7
-    PATCH = 10
-    FIX = nil
+    PATCH = 11
+    FIX = 1
 
     STRING = [MAJOR, MINOR, PATCH, FIX].compact.join('.')
   end

data/lib/active_scaffold.rb

@@ -68,7 +68,7 @@ module ActiveScaffold
         end
     when :prototype then warning += ', convert your app to jQuery, and remove this call'
     end
-    ActiveSupport::Deprecation.warn warning
+    deprecator.warn warning
     @@js_framework = framework
   end
 
@@ -110,6 +110,10 @@ module ActiveScaffold
   def self.defaults(&block)
     ActiveScaffold::Config::Core.configure(&block)
   end
+
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new('4.0', 'ActiveScaffold')
+  end
 end
 require 'active_scaffold/engine'
 require 'ice_nine'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.7.10
+  version: 3.7.11.1
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -147,12 +147,14 @@ files:
 - app/views/active_scaffold_overrides/_list_header.html.erb
 - app/views/active_scaffold_overrides/_list_inline_adapter.html.erb
 - app/views/active_scaffold_overrides/_list_messages.html.erb
+- app/views/active_scaffold_overrides/_list_messages_content.html.erb
 - app/views/active_scaffold_overrides/_list_pagination.html.erb
 - app/views/active_scaffold_overrides/_list_pagination_links.html.erb
 - app/views/active_scaffold_overrides/_list_record.html.erb
 - app/views/active_scaffold_overrides/_list_with_header.html.erb
 - app/views/active_scaffold_overrides/_messages.html.erb
 - app/views/active_scaffold_overrides/_new_record.js.erb
+- app/views/active_scaffold_overrides/_popup_adapter.html.erb
 - app/views/active_scaffold_overrides/_refresh_create_form.js.erb
 - app/views/active_scaffold_overrides/_refresh_list.js.erb
 - app/views/active_scaffold_overrides/_render_field.js.erb
@@ -290,6 +292,7 @@ files:
 - lib/active_scaffold/core.rb
 - lib/active_scaffold/data_structures/action_columns.rb
 - lib/active_scaffold/data_structures/action_link.rb
+- lib/active_scaffold/data_structures/action_link_separator.rb
 - lib/active_scaffold/data_structures/action_links.rb
 - lib/active_scaffold/data_structures/actions.rb
 - lib/active_scaffold/data_structures/association.rb