active_scaffold 3.6.9 → 3.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1e1f178ccfe11c704e5064d0ee50bfa6a27d6aee4f478f478e6e0529a7e0683
-  data.tar.gz: de3fb5ad387969bc8c796ca9db23de2f311e8b16f6002316456b475953d66ae1
+  metadata.gz: 5450d62d32a21683b6226c4b1a23694e0dac270987c78e5a5a4452271a55fd08
+  data.tar.gz: ef18b964d35d5796b193c2ffde31698d33fd083a4d3fa03d3f486cef418aa9ef
 SHA512:
-  metadata.gz: 175f49bcb07a4fd3fd313f5437b3d2b438a20d9a697e2cc481fcc7086a4a0add3e08fa342ed90f984fed13eff68bad632b8bd772bbbf6869319d1024ace9082d
-  data.tar.gz: 8db9c02a65266fc858910ecf180800c4adabe0913eb02cb3464db665f51ad3ab3230a5bc1e6d38a581d93a874d390e6e8fa7ae7f72ec5c09d54cbecfcb070a71
+  metadata.gz: 84fbaee76d085ccf789bb610e99a652ecabf4c2158a5813a8dba2b493fafd97bf02be6743874942dea47a9b3067b361c534d4faf832e4c007ec854aaddd53b85
+  data.tar.gz: c4e5d788ae233d7c853a24d6cadfc2c1e81e963da2abcb763a453e9cb0ef01a7b028de8af45e2943e29784dcbace065b097ca7a396c3d9cc9bf444955e329987

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+= 3.6.10
+- Don't add numerical constraints based on conditional validation
+- Fix typo in cache key for numerical constraints
+- Fix duplicated params in search form, e.g. embedded constraints
+
+= 3.6.9
 - Support depend on .rb or .json locale files for date picker bridge
 - Fix search with dates entered with timezone in datepicker
 

data/app/views/active_scaffold_overrides/_search.html.erb

@@ -14,7 +14,7 @@
   hidden_params = url_options.except(:controller, :action, :id, :search).to_query.split(Rack::Utils::DEFAULT_SEP)
 -%>
 
-<%= form_tag url_options, options do %>
+<%= form_tag url_options.slice(:controller, :action, :id, :search), options do %>
   <% hidden_params.each do |pair| -%>
     <% key, value = pair.split('=', 2).map { |str| Rack::Utils.unescape(str) } -%>
     <%= hidden_field_tag(key, value) %>

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -720,7 +720,9 @@ module ActiveScaffold
       # Try to get numerical constraints from model's validators
       def column_numerical_constraints(column, options)
         validators = column.active_record_class.validators.select do |v|
-          v.is_a?(ActiveModel::Validations::NumericalityValidator) && v.attributes.include?(column.name)
+          v.is_a?(ActiveModel::Validations::NumericalityValidator) &&
+            v.attributes.include?(column.name) &&
+            !v.options[:if] && !v.options[:unless]
         end
 
         equal_validator = validators.find { |v| v.options[:equal_to] }
@@ -770,7 +772,7 @@ module ActiveScaffold
       end
 
       def numerical_constraints_for_column(column, options)
-        constraints = Rails.cache.fetch("#{column.cache_key}#numerical_constarints") do
+        constraints = Rails.cache.fetch("#{column.cache_key}#numerical_constraints") do
           column_numerical_constraints(column, options)
         end
         constraints.merge(options)

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 6
-    PATCH = 9
+    PATCH = 10
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.6.9
+  version: 3.6.10
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails