active_scaffold 3.6.0.rc1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c9ea6700cdf564c8c6712df6f538251a00ab77d708a1cb6ddbaf1522f7f3c82
-  data.tar.gz: c71eb0579b0671fedf08104b51237f260b43ff5d6aa090c98a3ffffde943f31d
+  metadata.gz: d35f441c2847444fd7e591e529085d3613774e19b0dc2b87a6a7e046e39eb95a
+  data.tar.gz: 5028894d44f4ed52a7e3cf7f4f92d38d86c48221815ccbb2f28396ecbda447ec
 SHA512:
-  metadata.gz: dd0cb52f16d6a75545d491388cbde13f99db60cf0c951db73df00ce77dac5fdd09573331b510fcd2e9a2f637c539e754c8fab0838d5709e22fd8abb11128d9ae
-  data.tar.gz: b0b4558cf821b84701e42f730eb6699c49a82e3c1e70a6f570d6dd99abbb599f783dded394b94bd7aa96db89d4cd4a23e848480239d4256a5e3f596812ba4e17
+  metadata.gz: 0d92dc0e4e6933a0849269191d4b273083e6914606a3198ccd132754f1ef4607434d7ef5cf6e51268aa34c7c926613f75214aa5b1ac961a0784ca5b8a34133c3
+  data.tar.gz: b87a086b26a98a148a485fe9af2c55e483dbbb82a1ccc4231d7e468a4f5265022bef3899e05ae6e6af1fef63295456f43f2456ba17043f42e42a7a796bcdffde

data/CHANGELOG.rdoc

@@ -1,3 +1,29 @@
+= 3.6.2
+- Fix count query when association's primary key is string
+- Fix unauthorized_columns and constraint_columns with threadsafe enabled
+- Fix changing list.sorting and column.sort_by per request when threadsafe is enabled
+
+= 3.6.1
+- Display group cols vertically when subform layout is vertical
+- Fix html attributes for input datetime on field search, when jquery ui is not used
+- Fix constraint columns for nested list on through assocaitions
+- Support rails 6.1
+
+= 3.6.0
+- Fix i18n at ruby 3.0.0
+- Add list helper for bitfield column, so it display labels of selected checkboxes in list
+- Support rails 6.0
+
+= 3.6.0.rc2
+- Fix subform crud in subform subgroup when controller is embedded
+- Fix sorting for mongoid models, broken in 3.6.0.rc1
+- Improve add_new option, allow to change subform columns (with helper override calling super and add columns to locals argument)
+- Support add_new option for record_select or radio form_ui
+- Support add_new option for polymorphic associations (add_new may be array with class names to allow add new, or true to allow add new for any model)
+- Support description for columns displayed as subform
+- Don't mess with history if current page is not using activescaffold when is loaded
+- Fix changing sort_by per request when threadsafe is enabled
+
 = 3.6.0.rc1
 - Cleanup: deprecate ActiveScaffold.set_defaults for ActiveScaffold.defaults, rename some setters
 - Fix adding new action links on request with threadsafety enabled

data/README.md

@@ -1,6 +1,7 @@
+
 Overview
 ========
-[![Build status](https://travis-ci.org/activescaffold/active_scaffold.svg?branch=master)](https://travis-ci.org/activescaffold/active_scaffold)
+[![Build status](https://travis-ci.com/activescaffold/active_scaffold.svg?branch=master)](https://travis-ci.com/activescaffold/active_scaffold)
 [![Code Climate](https://codeclimate.com/github/activescaffold/active_scaffold/badges/gpa.svg)](https://codeclimate.com/github/activescaffold/active_scaffold)
 [![Test Coverage](https://codeclimate.com/github/activescaffold/active_scaffold/badges/coverage.svg)](https://codeclimate.com/github/activescaffold/active_scaffold)
 [![Dependency Status](https://gemnasium.com/activescaffold/active_scaffold.svg)](https://gemnasium.com/activescaffold/active_scaffold)
@@ -8,13 +9,13 @@ 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 >= 4.2.0 is supported, ruby >= 2.3 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 >= 4.2.0 and Rails <= 6.1 is supported, ruby >= 2.3 required.
 
 Branch Details
 --------------
-3-5-stable supports rails >= 4.0.x and ruby >= 2.0.0  
-3-4-stable supports rails >= 3.2.x and ruby >= 1.9.3  
-3-3-stable supports rails >= 3.2.x and ruby >= 1.8  
+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  
 rails-3.2 supports Rails 3.1 & 3.2, and is the current source of the 3.2.x line of gems.
 
 Quick Start
@@ -25,12 +26,12 @@ Added to Gemfile
 
     gem 'active_scaffold'
 
-For rails >= 5.1, add jquery to application.js before rails-ujs (with jquery-rails), or load jquery in your layout before application.js using CDN (e.g. jquery-rails-cdn). You can replace rails-ujs with jquery_ujs, although rails-ujs should work (never load both).
-
-    //= require jquery
+For rails >= 5.1, add jquery-rails to Gemfile, and install generator will jquery to application.js before rails-ujs. Also it's possible to load jquery in your layout before application.js using CDN (e.g. jquery-rails-cdn). You can replace rails-ujs with jquery_ujs, although rails-ujs should work (never load both).
 
     gem 'jquery-rails'
 
+For rails >= 6.0, installer generator will create app/assets/javascripts/application.js, add it to assets.precompile array and add javascript_include_tag in layout, as ActiveScaffold doesn't work with webpack yet. Jquery may be loaded by packs or assets pipeline.
+
 Run the following commands, for rails 4.2
 
     bundle install
@@ -39,7 +40,7 @@ Run the following commands, for rails 4.2
     rails g active_scaffold:resource Model [attrs]
     bundle exec rake db:migrate
     
-Or run the following commands, for rails 5
+Or run the following commands, for rails >= 5
 
     bundle install
     rails g active_scaffold:install

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

@@ -323,20 +323,34 @@ jQuery(document).ready(function($) {
     if (jQuery(this).prop('checked')) color_field.val('');
   });
 
-  jQuery(document).on('click', '.show-new-subform', function(e) {
-    e.preventDefault();
+  jQuery(document).on('click', '.hide-new-subform, .show-new-subform', function(e) {
     var $this = jQuery(this), line = $this.closest('.form-element'),
-      select = line.find('#' + $this.data('select-id')),
-      subform = line.find('#' + $this.data('subform-id'));
-    if (select.is(':visible')) {
-      select.hide().prop('disabled', true);
-      subform.show().find("input:disabled,select:disabled,textarea:disabled").prop('disabled', false);
-      $this.data('select-text', $this.html());
-      $this.html($this.data('subform-text'));
+      subform = line.find('#' + $this.data('subform-id')), radio = false, hide, select;
+    if ($this.is('[type=radio]')) {
+      radio = true;
+      hide = $this.is('.hide-new-subform');
     } else {
+      e.preventDefault();
+      hide = subform.is(':visible');
+    }
+    if ($this.data('select-id')) {
+      select = line.find('#' + $this.data('select-id'));
+      if (select.hasClass('recordselect') || select.is('.no-options')) select = select.next(':hidden').andSelf();
+    }
+    if (hide) {
       subform.hide().find("input:enabled,select:enabled,textarea:enabled").prop('disabled', true);
-      select.show().prop('disabled', false);
-      $this.html($this.data('select-text'));
+      if (select) select.show().prop('disabled', false);
+      if (radio) {
+        $this.closest('.form-element').find('[name="' + $this.attr('name') + '"].show-new-subform').prop('disabled', false);
+      } else $this.html($this.data('select-text'));
+    } else {
+      if (select) select.hide().prop('disabled', true);
+      subform.show().find("input:disabled,select:disabled,textarea:disabled").prop('disabled', false);
+      if (radio) $this.prop('disabled', true);
+      else {
+        $this.data('select-text', $this.html());
+        $this.html($this.data('subform-text'));
+      }
     }
   });
 
@@ -500,6 +514,7 @@ var ActiveScaffold = {
     ActiveScaffold.disable_optional_subforms(container);
   },
   setup_history_state: function() {
+    if (!jQuery('.active-scaffold').length) return;
     var data = {}, current_search_item = jQuery('.active-scaffold .filtered-message[data-search]');
     if (current_search_item.length) {
       // store user settings enabled, update state with current page, search and sorting
@@ -536,8 +551,27 @@ var ActiveScaffold = {
     jQuery('.as-js-button', element).show();
   },
   disable_optional_subforms: function(element) {
-    jQuery('.form-element select + .sub-form').each(function() {
-      jQuery("input:enabled,select:enabled,textarea:enabled", this).prop('disabled', true);
+    jQuery('.sub-form.optional', element).each(function () {
+      var $this = jQuery(this), toggle = $this.find('>.visibility-toggle');
+      if (toggle.length) {
+        var hide = toggle.text() == toggle.data('show');
+        $this.find('> [id] > .sub-form-record > .associated-record dl:first').each(function (i) {
+          var parent = jQuery(this).parent(), div_id = toggle.data('toggable') + i;
+          parent.children().wrapAll('<div id="' + div_id + '">');
+          if (hide) parent.find('> div').hide();
+          parent.prepend(toggle.clone().data('toggable', div_id));
+        });
+        toggle.remove();
+      }
+      if ($this.is(':visible')) {
+        var line = $this.closest('.form-element'), toggle = line.find('.show-new-subform[data-subform-id="' + $this.attr('id') + '"]').first();
+        if (toggle.is('[type=radio]')) toggle.prop('disabled', true);
+        else if (toggle.data('select-id')) {
+          select = line.find('#' + toggle.data('select-id'));
+          if (select.hasClass('recordselect') || select.is('.no-options')) select = select.next(':hidden').andSelf();
+          select.hide().prop('disabled', true);
+        }
+      } else $this.find("input:enabled,select:enabled,textarea:enabled").prop('disabled', true);
     });
   },
   sliders: function(element) {
@@ -1430,7 +1464,7 @@ ActiveScaffold.ActionLink.Table = ActiveScaffold.ActionLink.Abstract.extend({
     else {
       throw 'Unknown position "' + this.position + '"'
     }
-    ActiveScaffold.highlight(this.adapter.find('td').first().children());
+    ActiveScaffold.highlight(this.adapter.find('td').first().children().not('script'));
     ActiveScaffold.focus_first_element_of_form(this.adapter);
   }
 });

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -841,7 +841,7 @@ clear: left;
 padding: 5px 0;
 padding-left: 5px;
 }
-.active-scaffold .form-element select + .sub-form {
+.active-scaffold .form-element .sub-form.optional {
 float: none;
 }
 .active-scaffold .form-element .show-new-subform {

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

@@ -13,8 +13,9 @@ footer = render(:partial => 'form_association_footer', :locals => {:parent_recor
 -%>
 <h5>
   <%= column.label -%>
-  <%= link_to_visibility_toggle(subform_div_id, {:default_visible => !column.collapsed}) -%>
+  <%= link_to_visibility_toggle(subform_div_id, default_visible: !column.collapsed) -%>
 </h5>
+<%= 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? %>

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

@@ -6,11 +6,13 @@
   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)
   tr_id = "association-#{options[:id]}"
+  layout ||= config.subform.layout
 
-  if config.subform.layout == :vertical
+  if layout == :vertical
     record_tag ||= :div
     row_tag ||= :ol
     column_tag ||= :li
@@ -40,7 +42,7 @@
   <% end %>
   <% end %>
   <%= content_tag row_tag, :id => tr_id, :class => "association-record#{' association-record-new' if record.new_record?}#{' locked' if locked}" do %>
-  <% config.subform.columns.each_column(for: record.class, crud_type: :read, flatten: flatten) do |column| %>
+  <% columns.each_column(for: record.class, crud_type: :read, flatten: flatten) do |column| %>
   <%
     if column.respond_to? :each_column
       columns_groups << column
@@ -82,10 +84,24 @@
 
   <% columns_groups.each do |columns_group| %>
   <%= content_tag row_tag, :class => 'associated-record' 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 %>
+    <% if layout == :vertical %>
+      <% columns_group.each_column(for: record.class, crud_type: :read, flatten: true) do |col| %>
+        <%
+          col_class = default_col_class.clone
+          col_class << 'required' if col.required?
+          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 %>
+          <%= 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 %>
+      <% 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 %>
+      <% end %>
     <% end %>
   <% end %>
   <% end %>

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

@@ -2,10 +2,10 @@
 <%
   header_record_class = (show_blank_record && show_blank_record.class) || column.association.klass
 -%>
-  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record_class => header_record_class, :parent_column => column} %>
+  <%= render partial: 'horizontal_subform_header', :locals => {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} %>
-  <%= render :partial => 'form_association_record', :object => show_blank_record, :locals => {:scope => scope, :parent_record => parent_record, :column => column, :locked => true, :index => associated.size} if show_blank_record %>
+  <%= 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 %>
   <tfoot>
     <%= render :partial => 'horizontal_subform_footer', :locals => {:scope => scope, :parent_record => parent_record, :column => column} %>
   </tfoot>

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

@@ -1,7 +1,8 @@
 <thead>
   <tr>
     <%
-    active_scaffold_config_for(record_class).subform.columns.each_column(for: record_class, crud_type: :read) do |column|
+    columns ||= active_scaffold_config_for(record_class).subform.columns
+    columns.each_column(for: record_class, crud_type: :read) do |column|
       next unless column.is_a? ActiveScaffold::DataStructures::Column
       next unless in_subform?(column, parent_record, parent_column)
       hidden = column_renders_as(column) == :hidden

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

@@ -1,4 +1,4 @@
 <div id="<%= sub_form_list_id(:association => column.name, :id => parent_record.id || generated_id(parent_record) || 99999999999) %>">
-  <%= render :partial => 'form_association_record', :collection => associated, :locals => {:scope => scope, :parent_record => parent_record, :column => column} %>
-  <%= render :partial => 'form_association_record', :object => show_blank_record, :locals => {:scope => scope, :parent_record => parent_record, :column => column, :locked => true, :index => associated.size} if show_blank_record %>
+  <%= render partial: 'form_association_record', collection: associated, locals: {scope: scope, parent_record: parent_record, column: column, columns: local_assigns[:columns], layout: :vertical} %>
+  <%= render partial: 'form_association_record', object: show_blank_record, locals: {scope: scope, parent_record: parent_record, column: column, columns: local_assigns[:columns], layout: :vertical, locked: true, index: associated.size} if show_blank_record %>
 </div>

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

@@ -22,5 +22,5 @@
   ActiveScaffold.replace_html('<%= @column_span_id %>','<%= escape_javascript(get_column_value(@record, @column)) %>');
 <% end -%>
 <% if @column.calculation? -%>
-  ActiveScaffold.replace_html('<%= active_scaffold_calculations_id(:column => @column) %>', '<%= escape_javascript(render_column_calculation(@column)) %>');
+  ActiveScaffold.replace_html('<%= active_scaffold_calculations_id(:column => @column) %>', '<%= escape_javascript(render_column_calculation(@column, id_condition: false)) %>');
 <% end -%>

data/lib/active_scaffold/actions/core.rb

@@ -72,7 +72,8 @@ module ActiveScaffold::Actions
         else
           updated_record_with_column(@column, params.delete(:value), @scope)
         end
-      setup_parent(@record) if main_form_controller && @scope
+      # if @scope has more than 2 ] then it's subform inside subform, and assign parent would fail (found associotion may be through association)
+      setup_parent(@record) if main_form_controller && @scope && @scope.scan(']').size == 2
       after_render_field(@record, @column)
     end
 
@@ -277,7 +278,9 @@ module ActiveScaffold::Actions
 
     def new_model
       relation = beginning_of_chain
-      build_options = sti_nested_build_options(relation.klass) if nested? && nested.plural_association?
+      if nested? && nested.plural_association? && nested.match_model?(active_scaffold_config.model)
+        build_options = sti_nested_build_options(relation.klass)
+      end
       relation.respond_to?(:build) ? relation.build(build_options || {}) : relation.new
     end
 

data/lib/active_scaffold/actions/list.rb

@@ -161,7 +161,7 @@ module ActiveScaffold::Actions
 
     def count_query_on_association_class(column)
       key = column.association.primary_key || :id
-      query = column.association.klass.where(column.association.foreign_key => @records.map(&key))
+      query = column.association.klass.where(column.association.foreign_key => @records.map(&key.to_sym))
       if column.association.as
         query.where!(column.association.reverse_association.foreign_type => active_scaffold_config.model.name)
       end

data/lib/active_scaffold/actions/nested.rb

@@ -90,7 +90,7 @@ module ActiveScaffold::Actions
 
     def beginning_of_chain
       # only if nested is related to current controller, e.g. not when adding record in subform inside subform
-      if nested? && nested.association && nested.association.klass == active_scaffold_config.model
+      if nested? && nested.match_model?(active_scaffold_config.model)
         nested_chain_with_association
       elsif nested? && nested.scope
         nested_parent_record.send(nested.scope)

data/lib/active_scaffold/actions/subform.rb

@@ -9,19 +9,25 @@ module ActiveScaffold::Actions
 
     protected
 
-    def do_edit_associated
-      @parent_record = params[:id].nil? ? new_model : find_if_allowed(params[:id], :update)
-      if @parent_record.new_record?
-        apply_constraints_to_record @parent_record
-        create_association_with_parent @parent_record if nested?
+    def new_parent_record
+      parent_record = new_model
+      # don't apply if scope, subform inside subform, because constraints won't apply to parent_record
+      apply_constraints_to_record parent_record unless @scope
+      if nested? && nested.match_model?(active_scaffold_config.model)
+        create_association_with_parent parent_record
       end
+      parent_record
+    end
+
+    def do_edit_associated
+      @scope = params[:scope]
+      @parent_record = params[:id].nil? ? new_parent_record : find_if_allowed(params[:id], :update)
 
       cache_generated_id(@parent_record, params[:generated_id]) if @parent_record.new_record?
       @column = active_scaffold_config.columns[params[:child_association]]
 
       @record = find_associated_record if params[:associated_id]
       @record ||= build_associated(@column.association, @parent_record)
-      @scope = params[:scope]
     end
 
     def find_associated_record

data/lib/active_scaffold/attribute_params.rb

@@ -230,7 +230,7 @@ module ActiveScaffold
       return nil unless build_record_from_params?(attributes, column, parent_record)
       record = find_or_create_for_params(attributes, column, parent_record)
       if record
-        record_columns = active_scaffold_config_for(column.association.klass).subform.columns
+        record_columns = active_scaffold_config_for(record.class).subform.columns
         prev_constraints = record_columns.constraint_columns
         record_columns.constraint_columns = [column.association.reverse].compact
         update_record_from_params(record, record_columns, attributes, avoid_changes)
@@ -242,8 +242,9 @@ module ActiveScaffold
 
     def build_record_from_params?(params, column, record)
       current = record.send(column.name)
-      klass = column.association.klass
-      (column.association.collection? && !column.show_blank_record?(current)) || !attributes_hash_is_empty?(params, klass)
+      return true if column.association.collection? && !column.show_blank_record?(current)
+      klass = column.association.klass(record)
+      klass && !attributes_hash_is_empty?(params, klass)
     end
 
     # Attempts to create or find an instance of the klass of the association in parent_column from the
@@ -251,12 +252,12 @@ module ActiveScaffold
     # otherwise it will build a new one.
     def find_or_create_for_params(params, parent_column, parent_record)
       current = parent_record.send(parent_column.name)
-      klass = parent_column.association.klass
+      klass = parent_column.association.klass(parent_record)
       if params.key? klass.primary_key
         record_from_current_or_find(klass, params[klass.primary_key], current)
       elsif klass.authorized_for?(:crud_type => :create)
         association = parent_column.association
-        record = association.klass.new
+        record = klass.new
         if association.reverse_association&.belongs_to? && (association.collection? || current.nil?)
           record.send("#{parent_column.association.reverse}=", parent_record)
         end
@@ -278,17 +279,6 @@ module ActiveScaffold
       end
     end
 
-    def save_record_to_association(record, association, value, reverse = nil)
-      return unless association
-      if association.collection?
-        record.send(association.name) << value
-      elsif reverse&.belongs_to?
-        value.send("#{reverse.name}=", record)
-      else
-        record.send("#{association.name}=", value)
-      end
-    end
-
     # Determines whether the given attributes hash is "empty".
     # This isn't a literal emptiness - it's an attempt to discern whether the user intended it to be empty or not.
     def attributes_hash_is_empty?(hash, klass)

data/lib/active_scaffold/bridges/active_storage/active_storage_bridge.rb

@@ -24,6 +24,7 @@ module ActiveScaffold
           columns << field
           columns.exclude "#{field}_attachment#{'s' if field_type == :has_many}".to_sym
           columns.exclude "#{field}_blob#{'s' if field_type == :has_many}".to_sym
+          columns[field].includes ||= ["#{field}_attachment#{'s' if field_type == :has_many}".to_sym, "#{field}_blob#{'s' if field_type == :has_many}".to_sym]
           columns[field].form_ui ||= "active_storage_#{field_type}".to_sym
           columns[field].params.add "delete_#{field}"
         end

data/lib/active_scaffold/bridges/active_storage/list_ui.rb

@@ -3,7 +3,7 @@ module ActiveScaffold
     module ListColumnHelpers
       def active_scaffold_column_active_storage_has_one(record, column)
         attachment = record.send(column.name.to_s)
-        attachment.attached? ? link_for_attachment(attachment) : nil
+        attachment.attached? ? link_for_attachment(attachment, column) : nil
       end
 
       def active_scaffold_column_active_storage_has_many(record, column)
@@ -12,7 +12,7 @@ module ActiveScaffold
 
         attachments = active_storage_files.attachments
         if attachments.size <= 3 # Lets display up to three links, otherwise just show the count.
-          links = attachments.map { |attachment| link_for_attachment(attachment) }
+          links = attachments.map { |attachment| link_for_attachment(attachment, column) }
           safe_join links, association_join_text(column)
         else
           pluralize attachments.size, column.name.to_s
@@ -21,10 +21,10 @@ module ActiveScaffold
 
       private
 
-      def link_for_attachment(attachment)
+      def link_for_attachment(attachment, column)
         variant = column.options[:thumb] || ActiveScaffold::Bridges::ActiveStorage::ActiveStorageBridgeHelpers.thumbnail_variant
         content =
-          if variant && attachment.variable?
+          if variant && attachment.variable? && column.options[:thumb] != false
             image_tag(attachment.variant(variant))
           else
             attachment.filename