active_scaffold 4.0.3 → 4.0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce387b6ca519e9e9d6dc988524ffff98d3bdeaf6e142311381834421b2bcda20
-  data.tar.gz: 5634748e0efd3adac51276052ca840c582e1693593e03e1e3db364043c686f79
+  metadata.gz: 2e44db1771ebfc1694b53b616d22d0246bbae5b1346b04a67b0cf4caf95e7ea9
+  data.tar.gz: a6e861d18892297f0f6dfa2e330539a25b7547565290b60521cce82b5500ea02
 SHA512:
-  metadata.gz: 99c906010233a6cc88ad91b9921c6b4ecfb64a123a191f74253a73cc5571b744e7b1fa3f8f0cd41ac2d5ce4c46f4438d2eafbfd01d5b2df23689589a70439f6f
-  data.tar.gz: cd7afd2d8123f8a33c36b5e36575c3f1642f358d2b67ff29d071f8e2ed26a5c0a508c80934a92e920c653e79d20b94b754428113cfaa988a642fad6def9a20f7
+  metadata.gz: '033404898fecbf94f080b3fe2b2cdd4d6ba17d1d2f5d8f90dfbab1802e77ccbc94d5ed324b841231d2eed3d67e1566b8d0db7097148ceb34c0f894c672d4139e'
+  data.tar.gz: 87ce1767d5d384df6f539d83be6c294d20a65b77e88474046f04d4e5c4276e666ad96e1cd374d8508d866f8ebbc9fa6a0aa8eed93e843046cd6f76c347d8db3c

data/CHANGELOG.rdoc

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