active_scaffold 4.0.3 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce387b6ca519e9e9d6dc988524ffff98d3bdeaf6e142311381834421b2bcda20
-  data.tar.gz: 5634748e0efd3adac51276052ca840c582e1693593e03e1e3db364043c686f79
+  metadata.gz: 3c08117896f07d156bf39c05d52f76211e1294354e710d62eb7d43d8ff191515
+  data.tar.gz: 988856fbbbb7f4f4e052d33784646e0c371a4df89ab422205ae570879e5163fe
 SHA512:
-  metadata.gz: 99c906010233a6cc88ad91b9921c6b4ecfb64a123a191f74253a73cc5571b744e7b1fa3f8f0cd41ac2d5ce4c46f4438d2eafbfd01d5b2df23689589a70439f6f
-  data.tar.gz: cd7afd2d8123f8a33c36b5e36575c3f1642f358d2b67ff29d071f8e2ed26a5c0a508c80934a92e920c653e79d20b94b754428113cfaa988a642fad6def9a20f7
+  metadata.gz: ce177560652338e80e6135c6bc878a13800568115281e61f5a9d378cd1dd5542529e30230c8586c6a7e0d096be8ddb91e85f916d8d7e1b12643180f66a84cd66
+  data.tar.gz: 3abe0164c95eefaded8c9c9c715cb84d98762477a57a78084a7129817cc9d0740c86addacabe900ac810723e9058d8b9198ba8697d4a855a6de763254268a988

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+= 4.0.5
+- Fix if ActiveScaffold::Actions::Nested::ChildMethods is included manually after AS config block
+
+= 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

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'));

data/lib/active_scaffold/actions/nested.rb

@@ -129,7 +129,7 @@ module ActiveScaffold::Actions::Nested
   module ChildMethods
     def self.included(base)
       super
-      include_habtm_actions base.active_scaffold_config
+      include_habtm_actions base.active_scaffold_config unless base.active_scaffold_config.frozen?
     end
 
     def self.include_habtm_actions(config)

data/lib/active_scaffold/helpers/search_column_helpers.rb

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