active_scaffold 4.2.0 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b0a91aeeb1bc60a06fe9860ed1dd816c7b1c31af2f1ec5ba0edd40eca14aeab
-  data.tar.gz: c65e359d10216b4a68740814292c4428adcb92fbc4982143f4bdcb245c40fd19
+  metadata.gz: a411ae5638102ae3b9052929c30afcb44f769c9eeb528fdddd995ba7407bc5b9
+  data.tar.gz: 0171ab0f4fbde3b09cffae2553d7a7d90248bb5529f548e2321acb525610edd2
 SHA512:
-  metadata.gz: b6a1157e40597529cc709046dc473313df2f4e57e188b6525ec705a2b2d63ee9e4bd3710dc001aa98ff3dd1c55b3168a8276cca3ff52e4e3464b89edea89dec5
-  data.tar.gz: 357b94e6fb8e5de5d90d881ea2f797c33b388e8d01401fd5004c05f16f7e6c0148a67532600cb33d7fb3f44b1935c7d4ad8b76b2fbcd55f9b5edeb37bd6c211b
+  metadata.gz: d39d363d9ff5a27b07c124bf7718962d5355c879a77e48f5085f195d739b821276fdbda602078a0995c5385290dd158b2604acf75b863d323ce6ca1ac45d108d
+  data.tar.gz: 6afacdeacd3fd4b13d0115a8a7c3faba454c2e755bdea68485ebbbdb2c7a305b7022ca833e8960aa4c5df3258ce72236b5959c450d51306049ab652365429a6c

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+- Support setting form_ui_options with nil, for subforms
+- Support saving when embedded on through singular association, as it's supported for nested too
+
+= 4.2.1
+- Fix replacing tinymce fields with update_columns
+- Support refresh_link in radio form UI
+- Rewrite refresh_link JS event handler to find the field without relying in the html structure
+
 = 4.2.0
 - Integrate LogicalQueryParser, supporting full logical search, or simplified searches with 'all keywords' and 'any keyword' operators.
 - Display unauthorized column in form as show action, so show_ui or show override is used if exists.

data/README.md

@@ -13,11 +13,12 @@ ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, r
 Branch Details
 --------------
 master supports rails >= 7.2.x and ruby >= 3.2.0  
-4-1-stable supports rails >= 7.0.x and <= 7.2.x, and ruby >= 3.1.0
+4-2-stable supports rails >= 7.2.x and ruby >= 3.2.0
 
 These versions are not supported anymore:  
-4-0-stable supports rails >= 6.1.x and <= 7.2.x, and ruby >= 2.5.0
-3-7-stable supports rails >= 5.2.x and <= 7.1.x, and ruby >= 2.5.0
+4-1-stable supports rails >= 7.0.x and <= 7.2.x, and ruby >= 3.1.0  
+4-0-stable supports rails >= 6.1.x and <= 7.2.x, and ruby >= 2.5.0  
+3-7-stable supports rails >= 5.2.x and <= 7.1.x, and ruby >= 2.5.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  

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

@@ -321,14 +321,15 @@
       });
       jQuery(document).on('click', 'a.refresh-link', function(event) {
         event.preventDefault();
-        var element = jQuery(this);
-        var form_element = element.prev();
-        var value;
+        var element = jQuery(this), selector = element.data('field-selector'), value, form_element;
+        form_element = selector.startsWith('#') ? jQuery(selector) : element.closest('.form-element').find(selector);
+        if (form_element.is('.draggable-list')) form_element = form_element.closest('.draggable-lists-container');
         if (form_element.is(".field_with_errors")) form_element = form_element.children().last();
         if (form_element.is(".checkbox-list")) {
           value = form_element.find(':checked').map(function(item) { return jQuery(this).val(); }).toArray();
           form_element = form_element.parent().find("input:checkbox"); // parent is needed for draggable-list, checked list may be empty
-        } else value = form_element.is("input:checkbox:not(:checked)") ? null : form_element.val();
+        } else if (form_element.is(':radio, :checkbox')) value = form_element.filter(':checked').val() || null;
+        else value = form_element.val();
         ActiveScaffold.update_column(form_element, element.attr('href'), element.data('update_send_form'), form_element.attr('id'), value);
       });
       jQuery(document).on('click', 'a.visibility-toggle', function(e) {

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

@@ -7,6 +7,26 @@
     action_link_close.apply(this);
   };
 
+  ActiveScaffold.remove_tinymce = function(element) {
+    if (typeof(element) == 'string') element = '#' + element;
+    element = jQuery(element);
+    element.find('textarea.mceEditor').each(function(index, elem) {
+      tinymce.remove('#' + elem.id);
+    });
+  };
+
+  var as_replace = ActiveScaffold.replace,
+    as_replace_html = ActiveScaffold.replace_html;
+
+  ActiveScaffold.replace = function(element) {
+    this.remove_tinymce(element);
+    return as_replace.apply(this, arguments);
+  };
+  ActiveScaffold.replace_html = function(element) {
+    this.remove_tinymce(element);
+    return as_replace_html.apply(this, arguments);
+  };
+
   function loadTinyMCE() {
     var global_settings = ActiveScaffold.config.tiny_mce_settings || {};
     var local_settings = jQuery(this).data('tinymce');

data/lib/active_scaffold/actions/core.rb

@@ -146,6 +146,16 @@ module ActiveScaffold::Actions
       "#{params[:parent_controller].camelize}Controller"
     end
 
+    def create_on_through_singular(record, association, parent_record)
+      through = parent_record.send(association.through_reflection.name) ||
+                parent_record.send(:"build_#{association.through_reflection.name}")
+      if association.source_reflection.reverse_association.collection?
+        record.send(association.source_reflection.reverse) << through
+      else
+        record.send(:"#{association.source_reflection.reverse}=", through)
+      end
+    end
+
     def setup_parent
       cfg = main_form_controller.active_scaffold_config
       parent = cfg.model.new

data/lib/active_scaffold/actions/nested.rb

@@ -107,13 +107,7 @@ module ActiveScaffold::Actions
       if nested.child_association&.singular?
         record.send(:"#{nested.child_association.name}=", nested_parent_record)
       elsif nested.create_through_singular?
-        through = nested_parent_record.send(nested.association.through_reflection.name) ||
-                  nested_parent_record.send(:"build_#{nested.association.through_reflection.name}")
-        if nested.source_reflection.reverse_association.collection?
-          record.send(nested.source_reflection.reverse) << through
-        else
-          record.send(:"#{nested.source_reflection.reverse}=", through)
-        end
+        create_on_through_singular(record, nested.association, nested_parent_record)
       else
         record.send(nested.child_association.name) << nested_parent_record
       end

data/lib/active_scaffold/constraints.rb

@@ -171,7 +171,9 @@ module ActiveScaffold
       constraints.each do |k, v|
         column = config.columns[k]
         if column&.association
-          if column.association.collection?
+          if column.association.through_singular? && column.association.source_reflection.reverse
+            create_on_through_singular(record, column.association, column.association.klass.find(v))
+          elsif column.association.collection?
             record.send(k.to_s).send(:<<, column.association.klass.find(v)) unless column.association.nested?
           elsif column.association.polymorphic?
             unless v.is_a?(Array) && v.size >= 2
@@ -183,7 +185,7 @@ module ActiveScaffold
             else
               record.send(:"#{column.association.foreign_type}=", v[0])
             end
-          elsif !column.association.source_reflection&.options&.include?(:through) && # regular singular association, or one-level through association
+          elsif !column.association.source_reflection&.through? && # regular singular association, or one-level through association
                 !v.is_a?(Array)
             record.send(:"#{k}=", column.association.klass.find(v))
 

data/lib/active_scaffold/data_structures/association/active_record.rb

@@ -6,7 +6,7 @@ module ActiveScaffold::DataStructures::Association
       klass.reflect_on_all_associations
     end
 
-    delegate :collection?, :polymorphic?, :association_primary_key, :foreign_type, :table_name, :nested?, :scope, to: :@association
+    delegate :collection?, :polymorphic?, :association_primary_key, :foreign_type, :table_name, :nested?, :scope, :class_name, to: :@association
 
     def through?
       @association.options[:through].present?
@@ -17,11 +17,11 @@ module ActiveScaffold::DataStructures::Association
     end
 
     def through_reflection
-      @association.through_reflection if through?
+      @through_reflection ||= self.class.new(@association.through_reflection) if through?
     end
 
     def source_reflection
-      @association.source_reflection if through?
+      @source_reflection ||= self.class.new(@association.source_reflection) if through?
     end
 
     def inverse_klass

data/lib/active_scaffold/data_structures/column.rb

@@ -746,10 +746,14 @@ module ActiveScaffold::DataStructures
 
     def valid_action_ui_params?(value)
       if value.is_a?(Array)
-        value.size <= 2 && value[0].is_a?(Symbol) && (value[1].nil? || value[1].is_a?(Hash))
+        value.size <= 2 && valid_form_ui?(value[0]) && (value[1].nil? || value[1].is_a?(Hash))
       else
-        value.nil? || value.is_a?(Symbol)
+        valid_form_ui?(value)
       end
     end
+
+    def valid_form_ui?(value)
+      value.nil? || value.is_a?(Symbol)
+    end
   end
 end

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -104,8 +104,8 @@ module ActiveScaffold::DataStructures
     #    RatesController has employee in create action columns (reverse is vendor, and through association employee is in create form).
     def readonly_through_association?(columns)
       return false unless through_association?
-      return true if association.through_reflection.options[:through] # create not possible, too many levels
-      return true if association.source_reflection.options[:through] # create not possible, too many levels
+      return true if association.through_reflection.through? # create not possible, too many levels
+      return true if association.source_reflection.through? # create not possible, too many levels
       return false if create_through_singular? # create allowed, AS has code for this
       return false unless association.source_reflection.collection? # create allowed if source is singular, rails creates joint model
 
@@ -114,7 +114,7 @@ module ActiveScaffold::DataStructures
     end
 
     def create_through_singular?
-      association.through_singular? && source_reflection.reverse
+      association.through_singular? && association.source_reflection.reverse
     end
 
     def create_with_parent?
@@ -125,10 +125,6 @@ module ActiveScaffold::DataStructures
       end
     end
 
-    def source_reflection
-      @source_reflection ||= ActiveScaffold::DataStructures::Association::ActiveRecord.new(association.source_reflection)
-    end
-
     def through_association?
       association.through?
     end

data/lib/active_scaffold/finder.rb

@@ -245,7 +245,7 @@ module ActiveScaffold
       def logical_search_condition(column, search, parser = nil)
         model = column.active_record_class
         subquery = alias_query_for_same_table_exists(model.all) if column.logical_search.any?(Hash)
-        query = ::LogicalQueryParser.search(search, subquery || model, columns: column.logical_search, parser: parser)
+        query = ::LogicalQueryParser.search(search, subquery || model, column.logical_search, parser: parser)
         if subquery
           model.where(same_table_exists_subquery(query))
         else

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -167,15 +167,13 @@ module ActiveScaffold
       def build_associated(association, parent_record)
         if association.through? && association.through_reflection.collection?
           # build full chain, only check create_associated on initial parent_record
-          parent_record = build_associated(association.class.new(association.through_reflection), parent_record)
-          source_assoc = association.class.new(association.source_reflection)
-          build_associated(source_assoc, parent_record).tap do |record|
-            save_record_to_association(record, source_assoc.reverse_association, parent_record) # set inverse
+          parent_record = build_associated(association.through_reflection, parent_record)
+          build_associated(association.source_reflection, parent_record).tap do |record|
+            save_record_to_association(record, association.source_reflection.reverse_association, parent_record) # set inverse
           end
         elsif association.through? # through belongs_to/has_one
           parent_record = parent_record.send(association.through_reflection.name)
-          source_assoc = association.class.new(association.source_reflection)
-          build_associated(source_assoc, parent_record)
+          build_associated(association.source_reflection, parent_record)
         elsif association.collection?
           parent_record.send(association.name).build
         elsif association.belongs_to? || parent_record.new_record? || parent_record.send(association.name).nil?

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -504,7 +504,7 @@ module ActiveScaffold
       end
 
       def active_scaffold_refresh_link(column, html_options, record, ui_options = {})
-        link_options = {object: record}
+        link_options = {object: record, data: {field_selector: ui_options[:field_selector] || "##{html_options[:id]}"}}
         if html_options['data-update_url']
           link_options['data-update_send_form'] = html_options['data-update_send_form']
           link_options['data-update_send_form_selector'] = html_options['data-update_send_form_selector']
@@ -644,6 +644,54 @@ module ActiveScaffold
         content_tag(:label, radio_button(:record, column.name, value, radio_options) + text)
       end
 
+      def active_scaffold_input_radio_content(column, record, options, html_options, ui_options)
+        if ui_options[:add_new]
+          add_new_subform = ui_options[:add_new] == true || ui_options[:add_new][:mode].in?([nil, :subform])
+          if add_new_subform
+            html_options[:data] ||= {}
+            html_options[:data][:subform_id] = active_scaffold_subform_attributes(column, ui_options: ui_options)[:id]
+          end
+          radio_html_options = html_options.merge(class: "#{html_options[:class]} hide-new-subform")
+        else
+          radio_html_options = html_options
+        end
+
+        selected = record.send(column.association.name) if column.association
+        radios = options.map do |option|
+          active_scaffold_radio_option(option, selected&.id, column, radio_html_options, ui_options: ui_options)
+        end
+
+        if ui_options[:include_blank]
+          label = ui_options[:include_blank]
+          label = as_(ui_options[:include_blank]) if ui_options[:include_blank].is_a?(Symbol)
+          radio_id = "#{html_options[:id]}-"
+          radios.prepend content_tag(:label, radio_button(:record, column.name, '', html_options.merge(id: radio_id)) + label)
+        end
+        if ui_options[:add_new]
+          if add_new_subform
+            create_new = content_tag(:label) do
+              radio_button_tag(html_options[:name], '', selected&.new_record?, html_options.merge(
+                id: "#{html_options[:id]}-create_new", class: "#{html_options[:class]} show-new-subform"
+              ).except(:object)) <<
+                active_scaffold_add_new_text(ui_options[:add_new], :add_new_text, :create_new)
+            end
+            radios << create_new
+            skip_link = true
+          else
+            ui_options = ui_options.merge(add_new: ui_options[:add_new].merge(
+              url_options: {
+                parent_scope: html_options[:name].gsub(/^record|\[[^\]]*\]$/, '').presence,
+                radio_data: html_options.slice(*html_options.keys.grep(/^data-update_/))
+              }
+            ))
+            radios << content_tag(:span, '', class: 'new-radio-container', id: html_options[:id])
+          end
+          radios << active_scaffold_add_new(column, record, html_options, ui_options: ui_options, skip_link: skip_link)
+        end
+
+        safe_join radios
+      end
+
       def active_scaffold_input_radio(column, html_options, ui_options: column.options)
         record = html_options[:object]
         html_options.merge!(ui_options[:html_options] || {})
@@ -656,59 +704,19 @@ module ActiveScaffold
             send(enum_options_method, column, record, ui_options: ui_options)
           end
 
-        selected = record.send(column.association.name) if column.association
-        selected_id = selected&.id
         if options.present?
-          if ui_options[:add_new]
-            add_new_subform = ui_options[:add_new] == true || ui_options[:add_new][:mode].in?([nil, :subform])
-            if add_new_subform
-              html_options[:data] ||= {}
-              html_options[:data][:subform_id] = active_scaffold_subform_attributes(column, ui_options: ui_options)[:id]
-            end
-            radio_html_options = html_options.merge(class: "#{html_options[:class]} hide-new-subform")
-          else
-            radio_html_options = html_options
-          end
-          radios = options.map do |option|
-            active_scaffold_radio_option(option, selected_id, column, radio_html_options, ui_options: ui_options)
-          end
-          if ui_options[:include_blank]
-            label = ui_options[:include_blank]
-            label = as_(ui_options[:include_blank]) if ui_options[:include_blank].is_a?(Symbol)
-            radio_id = "#{html_options[:id]}-"
-            radios.prepend content_tag(:label, radio_button(:record, column.name, '', html_options.merge(id: radio_id)) + label)
-          end
-          if ui_options[:add_new]
-            if add_new_subform
-              create_new = content_tag(:label) do
-                radio_button_tag(html_options[:name], '', selected&.new_record?, html_options.merge(
-                  id: "#{html_options[:id]}-create_new", class: "#{html_options[:class]} show-new-subform"
-                ).except(:object)) <<
-                  active_scaffold_add_new_text(ui_options[:add_new], :add_new_text, :create_new)
-              end
-              radios << create_new
-              skip_link = true
-            else
-              ui_options = ui_options.merge(add_new: ui_options[:add_new].merge(
-                url_options: {
-                  parent_scope: html_options[:name].gsub(/^record|\[[^\]]*\]$/, '').presence,
-                  radio_data: html_options.slice(*html_options.keys.grep(/^data-update_/))
-                }
-              ))
-              radios << content_tag(:span, '', class: 'new-radio-container', id: html_options[:id])
-            end
-            radios << active_scaffold_add_new(column, record, html_options, ui_options: ui_options, skip_link: skip_link)
-          end
-          safe_join radios
+          html = active_scaffold_input_radio_content(column, record, options, html_options, ui_options)
         else
-          html = content_tag(:span, as_(:no_options), class: "#{html_options[:class]} no-options", id: html_options[:id])
-          html << hidden_field_tag(html_options[:name], '', id: nil)
+          html = content_tag(:span, as_(:no_options), class: "#{html_options[:class]} no-options")
+          html << hidden_field_tag(html_options[:name], '', id: html_options[:id])
           if ui_options[:add_new]
             html = content_tag(:div, html, class: 'select-field') <<
                    active_scaffold_add_new(column, record, html_options, ui_options: ui_options)
           end
           html
         end
+        html << active_scaffold_refresh_link(column, html_options, record, ui_options.merge(field_selector: "[name=\"#{html_options[:name]}\"]")) if ui_options[:refresh_link]
+        html
       end
 
       def active_scaffold_input_checkbox(column, options, ui_options: column.options)

data/lib/active_scaffold/version.rb

@@ -4,7 +4,7 @@ module ActiveScaffold
   module Version
     MAJOR = 4
     MINOR = 2
-    PATCH = 0
+    PATCH = 2
     FIX = nil
 
     STRING = [MAJOR, MINOR, PATCH, FIX].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.2
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-03 00:00:00.000000000 Z
+date: 2026-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dartsass-sprockets