active_scaffold 3.4.42 → 3.4.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aecf180e9830138a0201706df7188764f0b9883
-  data.tar.gz: bdd48e47cb5e3e89d68b276c2b0d34b10ea5b672
+  metadata.gz: 4c89a2575bfac755ce70fde2774b15e2a4ee4290
+  data.tar.gz: 47f69051b49d59a150b04c81c74d151452d1c629
 SHA512:
-  metadata.gz: fb10543e6069522af0f3c29f478af48beb4576f8e4a5238c229b7d23bdf7abea0f668c8fdfb60dfd2aab150042ae9b9ee6c8e84feb5832863ebb5b056bb41abc
-  data.tar.gz: d535738279bf832a6c7af0a402187440ea7ac4898a7e14b3a0d3d5b636b47b060e2e71ce3c60433ca9aebb06abb285700a8fb771c677fe1ca231e34655b7b0c8
+  metadata.gz: b8ac30db93e48681891cea00067f401ac8327f7ec139c38d8e5cccebbb493a7e5bbc535a5c1536d0666c768e60032de15f604b7c98274e02df0716c2d49f8304
+  data.tar.gz: f0f0300ea76e0a5c78e8839d2d3a18eb47f99f076319988f187992c95f05c1a40e4b0e3e8dbe46ab9861a34c97c4dffbbf488959ca085289370a56fe30e283ca

data/CHANGELOG

@@ -1,3 +1,6 @@
+= 3.4.43
+- Fix human conditions for date and datetime columns, not using date picker
+
 = 3.4.42
 - fix do_refresh_list on actions with GET route, it used :id and :action from request for sorting and pagination links
 - Fix for using jquery-ui-rails 6.0

data/lib/active_scaffold/finder.rb

@@ -138,7 +138,8 @@ module ActiveScaffold
 
       def condition_value_for_datetime(column, value, conversion = :to_time)
         if value.is_a? Hash
-          Time.zone.local(*[:year, :month, :day, :hour, :minute, :second].collect { |part| value[part].to_i }) rescue nil
+          time = Time.zone.local(*[:year, :month, :day, :hour, :minute, :second].collect { |part| value[part].to_i }) rescue nil
+          time.send(conversion) if time
         elsif value.respond_to?(:strftime)
           if conversion == :to_time
             # Explicitly get the current zone, because TimeWithZone#to_time in rails 3.2.3 returns UTC.

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -17,6 +17,7 @@ module ActiveScaffold
 
       def format_human_condition(column, opt, from = nil, to = nil)
         attribute = column.active_record_class.human_attribute_name(column.name)
+        opt ||= from && to ? :between : (from ? :'>=' : :'<=')
         "#{attribute} #{as_(opt).downcase} #{from} #{to}"
       end
 
@@ -36,8 +37,10 @@ module ActiveScaffold
 
       def active_scaffold_human_condition_date(column, value)
         conversion = column.column.type == :date ? :to_date : :to_time
-        from = I18n.l controller.condition_value_for_datetime(column, value['from'], conversion)
-        to = "- #{I18n.l controller.condition_value_for_datetime(column, value['to'], conversion)}" if value['opt'] == 'BETWEEN'
+        from = controller.class.condition_value_for_datetime(column, value['from'], conversion)
+        from = I18n.l from if from
+        to = controller.class.condition_value_for_datetime(column, value['to'], conversion) if value['opt'] == 'BETWEEN' || (value['opt'].nil? && value['to'])
+        to = "- #{I18n.l to}" if to
         format_human_condition column, value['opt'], from, to
       end
       alias_method :active_scaffold_human_condition_time, :active_scaffold_human_condition_date

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 42
+    PATCH = 43
 
     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.4.42
+  version: 3.4.43
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails