active_scaffold 4.0.1 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18ae38a98f317aedf4c54ade9d6cf3090b9de8e7042104dbe8493b10f173603a
-  data.tar.gz: 63548a6d7f130d6771818f8387be0b548e74bcd1ed7dc856733b3f72c2a96fda
+  metadata.gz: ce387b6ca519e9e9d6dc988524ffff98d3bdeaf6e142311381834421b2bcda20
+  data.tar.gz: 5634748e0efd3adac51276052ca840c582e1693593e03e1e3db364043c686f79
 SHA512:
-  metadata.gz: e1380da8c13475de3a825f828bb3d9109a52690f45d49cabd1be5bcbb138a2f36d985a676b9637e8a992a6ee551dc0f204b9103916e17845ee3990673219ab2c
-  data.tar.gz: 1861237d6327330311899eb90f0f4e8baee3cf81287f6336fb2c0634ab86073c41fa3838b7c2f923a11093e43ae07d074ac0a1a68bdc8df0ed1b23f91356bee2
+  metadata.gz: 99c906010233a6cc88ad91b9921c6b4ecfb64a123a191f74253a73cc5571b744e7b1fa3f8f0cd41ac2d5ce4c46f4438d2eafbfd01d5b2df23689589a70439f6f
+  data.tar.gz: cd7afd2d8123f8a33c36b5e36575c3f1642f358d2b67ff29d071f8e2ed26a5c0a508c80934a92e920c653e79d20b94b754428113cfaa988a642fad6def9a20f7

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+= 4.0.3
+- Fix for jQuery 3
+- Fix position popup for collection action links
+- Fix recordselect in form open with position popup
+- Fix class of subform on optional subform using add_new option with layout option
+- Fix constraints with mulitple ids for belongs_to associations with primary_key setting
+- Fix render_field when a column changes, and a column to refresh exists in a subform with the same name too
+
+= 4.0.2
+- Fix using update_columns in field search with search UI submitting a hash, such as date fields
+- Support disabling update_columsns on field_search
+
+= 4.0.1
 - Add :text_editor show_ui, to avoid escaping html code
 - Fix action link on association column named record
 
@@ -11,6 +24,10 @@
 - Thread safety enabled by default, can't be disabled, deprecate ActiveScaffold.threadsafe!
 - Support subgroups on field search
 
+= 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
 

data/README.md

@@ -70,7 +70,7 @@ Changing columns for an action (e.g. add or exclude) on a request must use activ
 
 If you have a `_form_association_record` partial view overrided, use `record` local variable instead of `form_association_record`.
 
-If you have code rendering `form_association_record` partial, the pass `record` local variable, or use `as: :record` if using render with collection key.
+If you have code rendering `form_association_record` partial, then pass `record` local variable, or use `as: :record` if using render with collection key.
 
 Configuration
 -------------

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

@@ -356,7 +356,7 @@
         }
         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 (select.hasClass('recordselect') || select.is('.no-options')) select = select.next(':hidden').addBack();
         }
         if (hide) {
           subform.hide().find("input:enabled,select:enabled,textarea:enabled").prop('disabled', true);
@@ -589,7 +589,7 @@
             if (toggle.is('[type=radio]')) toggle.prop('disabled', true);
             else if (toggle.data('select-id')) {
               var select = line.find('#' + toggle.data('select-id'));
-              if (select.hasClass('recordselect') || select.is('.no-options')) select = select.next(':hidden').andSelf();
+              if (select.hasClass('recordselect') || select.is('.no-options')) select = select.next(':hidden').addBack();
               select.hide().prop('disabled', true);
             }
           } else $this.find("input:enabled,select:enabled,textarea:enabled").prop('disabled', true);
@@ -978,14 +978,17 @@
         if (typeof(source) == 'string') source = '#' + source;
         var source = jQuery(source);
         var element, container = source.closest('.sub-form-record'), selector = '';
-        if (container.length == 0) {
+        if (container.length === 0) {
           container = source.closest('form > ol.form');
           selector = 'li';
         }
         // find without entering new subforms
-        element = container.find(selector + ':not(.sub-form) .' + options.field_class).first();
+        element = container.find(selector + ':not(.sub-form) .' + options.field_class);
+        if (container.is('.sub-form-record'))
+          element = element.filter(function() { return $(this).closest('.sub-form-record').get(0) === container.get(0); });
+        else element = element.filter(function() { return $(this).closest('.sub-form-record').length === 0; });
         if (element.length)
-          element = element.closest('dl');
+          element = element.first().closest('dl');
         else if (options.subform_class)
           element = container.find(selector + '.' + options.subform_class).first();
 
@@ -1235,7 +1238,7 @@
       },
 
       open_popup: function(content, link) {
-        var element = jQuery(content).dialog({
+        var element = jQuery(content).filter(function(){ return this.tagName; }).dialog({
           modal: true,
           close: function() { link.close(); },
           width: ActiveScaffold.config.popup_width || '80%'
@@ -1245,7 +1248,7 @@
 
       close_popup: function(link, callback) {
         link.adapter.dialog('close');
-        if (callback) callback();
+        ActiveScaffold.remove(link.adapter, callback);
       }
     }
 
@@ -1518,7 +1521,7 @@
       instantiate_link: function(link) {
         var l = new ActiveScaffold.ActionLink.Table(link, this.target, this.loading_indicator);
         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);
         }
         return l;

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

@@ -217,7 +217,7 @@ $.extend(InlineEditor.prototype, {
 		if ( ! this.settings.cancel)
 			return false;
 		
-		var eventTargetAndParents = $(eventTarget).parents().andSelf();
+		var eventTargetAndParents = $(eventTarget).parents().addBack();
 		var elementsMatchingCancelSelector = eventTargetAndParents.filter(this.settings.cancel);
 		return 0 !== elementsMatchingCancelSelector.length;
 	},

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

@@ -10,3 +10,4 @@
   <% end %>
 <% end %>
 <% require_asset 'jquery-ui-theme' if ActiveScaffold.jquery_ui_included? %>
+.ui-front { z-index: 98; }

data/lib/active_scaffold/actions/core.rb

@@ -115,7 +115,11 @@ module ActiveScaffold::Actions
       copy_attributes(saved_record, record) if saved_record
       apply_constraints_to_record(record) unless scope
       create_association_with_parent record, check_match: true if nested?
-      update_record_from_params(record, columns, attributes || {}, true)
+      if @form_action == :field_search
+        update_columns_from_params(record, columns, attributes || {}, :read, avoid_changes: true, search_attributes: true)
+      else
+        update_record_from_params(record, columns, attributes || {}, true)
+      end
     end
 
     def updated_record_with_column(column, value, scope)

data/lib/active_scaffold/attribute_params.rb

@@ -55,13 +55,17 @@ module ActiveScaffold
     #
     # This is a secure way to apply params to a record, because it's based on a loop over the columns
     # set. The columns set will not yield unauthorized columns, and it will not yield unregistered columns.
-    def update_record_from_params(parent_record, columns, attributes, avoid_changes = false)
+    def update_record_from_params(parent_record, columns, attributes, avoid_changes = false, search_attributes: false)
       crud_type = parent_record.new_record? ? :create : :update
       return parent_record unless parent_record.authorized_for?(crud_type: crud_type)
 
-      multi_parameter_attrs = multi_parameter_attributes(attributes)
       assign_locking_column(parent_record, attributes)
+      update_columns_from_params(parent_record, columns, attributes, crud_type, avoid_changes: avoid_changes, search_attributes: search_attributes)
+      parent_record
+    end
 
+    def update_columns_from_params(parent_record, columns, attributes, crud_type, avoid_changes: false, search_attributes: false)
+      multi_parameter_attrs = multi_parameter_attributes(attributes)
       columns.each_column(for: parent_record, crud_type: crud_type, flatten: true) do |column|
         # Set any passthrough parameters that may be associated with this column (ie, file column "keep" and "temp" attributes)
         assign_column_params(parent_record, column, attributes)
@@ -69,16 +73,16 @@ module ActiveScaffold
         if multi_parameter_attrs.key? column.name.to_s
           parent_record.send(:assign_multiparameter_attributes, multi_parameter_attrs[column.name.to_s])
         elsif attributes.key? column.name
+          next if search_attributes && params_hash?(attributes[column.name])
+
           update_column_from_params(parent_record, column, attributes[column.name], avoid_changes)
         end
       rescue StandardError => e
         message = "on the ActiveScaffold column = :#{column.name} for #{parent_record.inspect} " \
                   "(value from params #{attributes[column.name].inspect})"
         Rails.logger.error "#{e.class.name}: #{e.message} -- #{message}"
-        raise
+        raise e.class, "#{e.message} -- #{message}"
       end
-
-      parent_record
     end
 
     def assign_column_params(parent_record, column, attributes)

data/lib/active_scaffold/bridges/record_select/helpers.rb

@@ -78,7 +78,7 @@ class ActiveScaffold::Bridges::RecordSelect
           column.association.klass.find(value.to_i)
         end
       rescue StandardError => e
-        logger.error "#{e.class.name}: #{e.message} -- Sorry, we are not that smart yet. Attempted to restore search values to search fields :#{column.name} in #{controller.class}"
+        Rails.logger.error "#{e.class.name}: #{e.message} -- Sorry, we are not that smart yet. Attempted to restore search values to search fields :#{column.name} in #{controller.class}"
         raise e
       end
     end

data/lib/active_scaffold/config/field_search.rb

@@ -37,6 +37,9 @@ module ActiveScaffold::Config
 
     cattr_accessor :reset_form, instance_accessor: false
 
+    # whether refresh columns defined in update_columns when a column is changed, as create and update forms do
+    cattr_accessor :update_columns
+
     # instance-level configuration
     # ----------------------------
 
@@ -85,8 +88,11 @@ module ActiveScaffold::Config
 
     attr_accessor :reset_form
 
+    # whether refresh columns defined in update_columns when a column is changed, as create and update forms do
+    attr_accessor :update_columns
+
     UserSettings.class_eval do
-      user_attr :optional_columns, :group_options, :grouped_columns, :human_conditions, :floating_footer
+      user_attr :optional_columns, :group_options, :grouped_columns, :human_conditions, :floating_footer, :update_columns
     end
   end
 end

data/lib/active_scaffold/constraints.rb

@@ -128,7 +128,7 @@ module ActiveScaffold
         end
 
       table = association.belongs_to? ? active_scaffold_config.model.table_name : association.table_name
-      value = association.klass.find(value).send(association.primary_key) if association.primary_key
+      value = Array(association.klass.find(value)).map(&association.primary_key.to_sym) if association.primary_key
 
       if association.polymorphic?
         unless value.is_a?(Array) && value.size >= 2

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -47,7 +47,7 @@ module ActiveScaffold
           text_field(:record, column.name, options.merge(column.options).except(:format))
         end
       rescue StandardError => e
-        logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
+        Rails.logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
         raise e
       end
 
@@ -70,9 +70,9 @@ module ActiveScaffold
         end
       end
 
-      def active_scaffold_subform_attributes(column, column_css_class = nil, klass = nil, tab_id: nil)
+      def active_scaffold_subform_attributes(column, column_css_class = nil, klass = nil, tab_id: nil, ui_options: column.options)
         {
-          class: "sub-form #{active_scaffold_config_for(klass || column.association.klass).subform.layout}-sub-form #{column_css_class} #{column.name}-sub-form",
+          class: "sub-form #{ui_options[:layout] || active_scaffold_config_for(klass || column.association.klass).subform.layout}-sub-form #{column_css_class} #{column.name}-sub-form",
           id: sub_form_id(association: column.name, tab_id: tab_id)
         }
       end
@@ -364,7 +364,7 @@ module ActiveScaffold
           end
         return content_tag(:div, '') unless klass
 
-        subform_attrs = active_scaffold_subform_attributes(column, nil, klass)
+        subform_attrs = active_scaffold_subform_attributes(column, nil, klass, ui_options: ui_options)
         if record.send(column.name)&.new_record?
           new_record = record.send(column.name)
         else
@@ -568,7 +568,7 @@ module ActiveScaffold
         if options.present?
           if ui_options[:add_new]
             html_options[:data] ||= {}
-            html_options[:data][:subform_id] = active_scaffold_subform_attributes(column)[:id]
+            html_options[:data][:subform_id] = active_scaffold_subform_attributes(column, ui_options: ui_options)[:id]
             radio_html_options = html_options.merge(class: "#{html_options[:class]} hide-new-subform")
           else
             radio_html_options = html_options

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -22,7 +22,7 @@ module ActiveScaffold
         value = ' '.html_safe if value.nil? || value.blank? # fix for IE 6
         value
       rescue StandardError => e
-        logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}, record: #{record.inspect}"
+        Rails.logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}, record: #{record.inspect}"
         raise e
       end
 
@@ -62,7 +62,7 @@ module ActiveScaffold
           text
         end
       rescue StandardError => e
-        logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
+        Rails.logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
         raise e
       end
 

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -6,8 +6,10 @@ module ActiveScaffold
       # It does not do any rendering. It only decides which method is responsible for rendering.
       def active_scaffold_search_for(column, options = nil)
         options ||= active_scaffold_search_options(column)
-        search_columns = active_scaffold_config.field_search.columns.visible_columns_names
-        options = update_columns_options(column, nil, options, form_columns: search_columns, url_params: {form_action: :field_search})
+        if active_scaffold_config.field_search.update_columns
+          search_columns = active_scaffold_config.field_search.columns.visible_columns_names
+          options = update_columns_options(column, nil, options, form_columns: search_columns, url_params: {form_action: :field_search})
+        end
         record = options[:object]
         if column.delegated_association
           record = record.send(column.delegated_association.name) || column.active_record_class.new
@@ -41,7 +43,7 @@ module ActiveScaffold
           text_field(:record, column.name, options.merge(column.options))
         end
       rescue StandardError => e
-        logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
+        Rails.logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
         raise e
       end
 

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 4
     MINOR = 0
-    PATCH = 1
+    PATCH = 3
     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.0.1
+  version: 4.0.3
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails