Fixes the bug #395

leikind · Oct 23, 2024 · a974053 · a974053
1 parent ca66fb2
commit a974053
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 7.1.3
+
+* Fixes [the bug](https://github.com/leikind/wice_grid/issues/395).
+
 ## 7.1.2
 
 * This is the fix for the workaround of the [Facebook](https://www.facebook.com) problem.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -16,7 +16,7 @@ GIT
 PATH
   remote: .
   specs:
-    wice_grid (7.1.2)
+    wice_grid (7.1.3)
       coffee-rails (>= 5.0.0)
       jquery-rails
       kaminari

diff --git a/lib/wice/columns/column_integer.rb b/lib/wice/columns/column_integer.rb
@@ -36,8 +36,7 @@ def self.get_value(val) #:nodoc:
         separator = I18n.t!('number.format.separator') rescue nil
         val = val.sub(separator, '.') if val.respond_to?(:sub) && separator
 
-        # Parse as float
-        Float(val) rescue nil
+        Integer(val) rescue nil
       end
 
       def get_op_and_value(val) #:nodoc:

diff --git a/lib/wice_grid.rb b/lib/wice_grid.rb
@@ -189,7 +189,6 @@ def with_resultset(&callback)
     end
 
     def fix_facebook_bug
-        Rails.logger.debug {%%WiceGrid@#{__LINE__}#fix_facebook_bug: #{params[name].inspect}%}
       if params[name] and filter = params[name][:f]
         params[name][:f] = filter.to_unsafe_h
             .each_with_object({}) do |(key, value), hash|
@@ -267,8 +266,12 @@ def declare_column(
       end
 
       if column
-        conditions_generator = ActiveRecordColumnWrapper.new(column, @status[:f], main_table, table_alias, custom_filter_active, filter_type)
-        conditions, current_parameter_name = conditions_generator.wg_initialize_request_parameters
+        conditions_generator = ActiveRecordColumnWrapper.new(
+          column, @status[:f], main_table,
+          table_alias, custom_filter_active, filter_type
+        )
+        conditions, current_parameter_name =
+            conditions_generator.wg_initialize_request_parameters
 
         if @status[:f] && conditions.blank?
           @status[:f].delete(current_parameter_name)

diff --git a/wice_grid.gemspec b/wice_grid.gemspec
@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name          = 'wice_grid'
-  s.version       = '7.1.2'
-  s.authors       = ['Yuri Leikind and contributors']
+  s.version       = '7.1.3'
+  s.authors       = ['Yuri Leikind, Dimitri Kulk, and contributors']
   s.email         = ['[email protected]']
   s.homepage      = 'https://github.com/leikind/wice_grid'
   s.summary       = 'A Rails grid plugin to quickly create grids with sorting, pagination, and filters.'