active_scaffold 4.0.2 → 4.0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1411d7317097c53427854d287da2fe123d38498ab8bbff98308798c6da5ffc9b
-  data.tar.gz: 46a02c5b035126602809edc855e0b6edb71f532c5bd66e91a5347a596895743e
+  metadata.gz: 2e44db1771ebfc1694b53b616d22d0246bbae5b1346b04a67b0cf4caf95e7ea9
+  data.tar.gz: a6e861d18892297f0f6dfa2e330539a25b7547565290b60521cce82b5500ea02
 SHA512:
-  metadata.gz: 250738344e423f2a7509c299f7fcc813a7d36b557d245b3f983ff6bcf6c122729482f2b469625e78d2d9d4252a6d74976ebce6b8cd532ff7ca3633f391171cc3
-  data.tar.gz: 3bda9ffc65eeda39907a9a216ea7f6f8af6ddc799182f7a4d867a2790f9c53d5ba7ec0297326eb1bb19974734e49926bc09ac5561114030c226b986d87cd41f6
+  metadata.gz: '033404898fecbf94f080b3fe2b2cdd4d6ba17d1d2f5d8f90dfbab1802e77ccbc94d5ed324b841231d2eed3d67e1566b8d0db7097148ceb34c0f894c672d4139e'
+  data.tar.gz: 87ce1767d5d384df6f539d83be6c294d20a65b77e88474046f04d4e5c4276e666ad96e1cd374d8508d866f8ebbc9fa6a0aa8eed93e843046cd6f76c347d8db3c

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+= 4.0.4.2
+- Support show key in helpers for search date/datetime, to change default condition to render it hidden
+
+= 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

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

@@ -304,12 +304,6 @@
         return true;
       });
 
-      jQuery(document).on('change', 'select.as_update_date_operator', function(event) {
-        ActiveScaffold[jQuery(this).val() == 'REPLACE' ? 'show' : 'hide'](jQuery(this).next());
-        ActiveScaffold[jQuery(this).val() == 'REPLACE' ? 'hide' : 'show'](jQuery(this).next().next());
-        return true;
-      });
-
       jQuery(document).on('click', '.active-scaffold .sub-form a.destroy', function(event) {
         event.preventDefault();
         ActiveScaffold.delete_subform_record($(this).data('delete-id'));
@@ -356,7 +350,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 +583,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 +972,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 +1232,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 +1242,7 @@
 
       close_popup: function(link, callback) {
         link.adapter.dialog('close');
-        if (callback) callback();
+        ActiveScaffold.remove(link.adapter, callback);
       }
     }
 
@@ -1518,7 +1515,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/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/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

@@ -43,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
 
@@ -323,9 +323,10 @@ module ActiveScaffold
             safe_join([' - ', send(helper, column, options, current_search, 'to', ui_options: ui_options)])
           end
         ]
+        show = current_search.key?(:show) ? current_search[:show] : ActiveScaffold::Finder::NUMERIC_COMPARATORS.include?(current_search['opt'])
         content_tag('span', safe_join(numeric_controls),
                     id: "#{options[:id]}_numeric", class: 'search-date-numeric',
-                    style: ActiveScaffold::Finder::NUMERIC_COMPARATORS.include?(current_search['opt']) ? nil : 'display: none')
+                    style: ('display: none' unless show))
       end
 
       def active_scaffold_search_datetime_trend_tag(column, options, current_search)
@@ -335,9 +336,10 @@ module ActiveScaffold
                      options_for_select(active_scaffold_search_datetime_trend_units(column), current_search['unit']),
                      class: 'text-input')
         ]
+        show = current_search.key?(:show) ? current_search[:show] : current_search['opt'] == 'PAST' || current_search['opt'] == 'FUTURE'
         content_tag('span', safe_join(trend_controls, ' '),
                     id: "#{options[:id]}_trend", class: 'search-date-trend',
-                    style: ('display: none' unless current_search['opt'] == 'PAST' || current_search['opt'] == 'FUTURE'))
+                    style: ('display: none' unless show))
       end
 
       def active_scaffold_search_datetime_trend_units(column)
@@ -351,9 +353,10 @@ module ActiveScaffold
         range_controls = select_tag("#{options[:name]}[range]",
                                     options_for_select(values, current_search['range']),
                                     class: 'text-input', id: nil)
+        show = current_search.key?(:show) ? current_search[:show] : current_search['opt'] == 'RANGE'
         content_tag('span', range_controls,
                     id: "#{options[:id]}_range", class: 'search-date-range',
-                    style: ('display: none' unless current_search['opt'] == 'RANGE'))
+                    style: ('display: none' unless show))
       end
 
       def column_datetime?(column)

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.4.2
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-26 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails