active_scaffold 3.4.38 → 3.4.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f85e22fd8b8ed0d15b333d211f081e24ee2484d6
-  data.tar.gz: 8b490194e7d7adc60a00d0a3c14d718948078c69
+  metadata.gz: 3a46edc1511bb6fce264d9a5501dbd457988f3a2
+  data.tar.gz: 861d1f3c682de2f0f2679ef0d037d9e728a48db6
 SHA512:
-  metadata.gz: 4e238be107e91bde560a8eef3e60ce62d5018c3918a03779c3782f12f770e47ee68bafa96253b520629f437630e2e828f5e88266eb545117378024435fef4099
-  data.tar.gz: faf799e2a71c5c80fa71f6c8bd0f2fe84b580e01b793f52ac259520d90b2a5bc4e890383553e560a596f0c2388677c2935fa44febc3e97da9dd69f398fc7de1f
+  metadata.gz: 2e50e693ef1eb90f8ab74ef85906c5d0529c6c9f27b50d6e2c6cd3325532b7837a4350421357e03f29ffcec384f984634293f996bfb308981b08ac5d8279e936
+  data.tar.gz: b9cd9f61abadffadf976c12b18c95acb729746a42983844b133c25c2341619abaf213480ed67704f20be3ee09b146e5fef2fbbc02f4952cb973116501f8aff8a

data/CHANGELOG

@@ -1,3 +1,9 @@
+= 3.4.39
+- fix removing delete link with config.delete.link = false, broken on 3.4.38
+- fix position of nested action groups
+- fix human conditions with rails 4.2 and json session
+- fix search conditions for decimal columns on rails 4.2
+
 = 3.4.38
 - ensure add_existing and delete_existing are removed when list is not nested
 - add :percentage list_ui, use jquery ui slider, set slider options on column.options[:slider], :value_method (default to column name), :min_method and :max_method to get value, min and max options from record

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -104,6 +104,10 @@ top: 19px;
 top: 14px;
 }
 
+.active-scaffold .active-scaffold .active-scaffold-header div.actions .action_group ul ul {
+top: -3px;
+}
+
 .active-scaffold-header div.actions a.disabled {
 opacity: 0.5;
 }

data/lib/active_scaffold/actions/nested.rb

@@ -68,8 +68,8 @@ module ActiveScaffold::Actions
 
         if active_scaffold_config.nested.shallow_delete
           active_scaffold_config.action_links.delete('destroy_existing') if active_scaffold_config.action_links['destroy_existing']
-          if active_scaffold_config.actions.include?(:delete)
-            active_scaffold_config.action_links.add(ActiveScaffold::Config::Delete.link) unless active_scaffold_config.action_links['delete']
+          if active_scaffold_config.actions.include?(:delete) && active_scaffold_config.delete.link
+            active_scaffold_config.action_links.add(active_scaffold_config.delete.link) unless active_scaffold_config.action_links['delete']
           end
         end
       end

data/lib/active_scaffold/finder.rb

@@ -182,7 +182,12 @@ module ActiveScaffold
         case (column.search_ui || column.column.type)
         when :integer   then value.to_i rescue value ? 1 : 0
         when :float     then value.to_f
-        when :decimal   then ActiveRecord::ConnectionAdapters::Column.value_to_decimal(value)
+        when :decimal
+          if Rails.version >= '4.2.0'
+            ActiveRecord::Type::Decimal.new.type_cast_from_user(value)
+          else
+            ActiveRecord::ConnectionAdapters::Column.value_to_decimal(value)
+          end
         else
           value
         end

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -21,24 +21,24 @@ module ActiveScaffold
       end
 
       def active_scaffold_human_condition_integer(column, value)
-        from = format_number_value(controller.class.condition_value_for_numeric(column, value[:from]), column.options) if value[:from].present?
-        to = "- #{format_number_value(controller.class.condition_value_for_numeric(column, value[:to]), column.options)}" if value[:opt] == 'BETWEEN'
-        format_human_condition column, value[:opt].downcase, from, to
+        from = format_number_value(controller.class.condition_value_for_numeric(column, value['from']), column.options) if value['from'].present?
+        to = "- #{format_number_value(controller.class.condition_value_for_numeric(column, value['to']), column.options)}" if value['opt'] == 'BETWEEN'
+        format_human_condition column, value['opt'].downcase, from, to
       end
       alias_method :active_scaffold_human_condition_decimal, :active_scaffold_human_condition_integer
       alias_method :active_scaffold_human_condition_float, :active_scaffold_human_condition_integer
 
       def active_scaffold_human_condition_string(column, value)
-        opt = ActiveScaffold::Finder::STRING_COMPARATORS.key(value[:opt]) || value[:opt]
-        to = "- #{value[:to]}" if opt == 'BETWEEN'
-        format_human_condition column, opt, "'#{value[:from]}'", to
+        opt = ActiveScaffold::Finder::STRING_COMPARATORS.key(value['opt']) || value['opt']
+        to = "- #{value['to']}" if opt == 'BETWEEN'
+        format_human_condition column, opt, "'#{value['from']}'", to
       end
 
       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'
-        format_human_condition column, value[:opt], from, to
+        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'
+        format_human_condition column, value['opt'], from, to
       end
       alias_method :active_scaffold_human_condition_time, :active_scaffold_human_condition_date
       alias_method :active_scaffold_human_condition_datetime, :active_scaffold_human_condition_date

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -153,9 +153,9 @@ module ActiveScaffold
       end
 
       def field_search_params_range_values(column)
-        values = field_search_params[column.name]
+        values = field_search_params[column.name.to_s]
         return nil unless values.is_a? Hash
-        [values[:opt], (values[:from].blank? ? nil : values[:from]), (values[:to].blank? ? nil : values[:to])]
+        [values['opt'], values['from'].presence, values['to'].presence]
       end
 
       def active_scaffold_search_range_string?(column)

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 38
+    PATCH = 39
 
     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.38
+  version: 3.4.39
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler