active_scaffold 3.4.28 → 3.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efbb6369eb3a5aa9cb4309e764850525ba2e46c2
-  data.tar.gz: 3acbbbe42eea4e99a3039eb36c9aeaab50bb9f1e
+  metadata.gz: dc80a3e80925ceb736fe6db2e5446e1ddf5e53bf
+  data.tar.gz: 38a31dc92324a6e82dec8b513693459ee8ca9724
 SHA512:
-  metadata.gz: 679592e18cba2f389ee6c7edaeab510c6ae761f51eedebb8f28846aaedb3e4265da572dae80b14aba23e74e34f63b07792efe6388335121b0c9bdcb612434f42
-  data.tar.gz: 2c30a66c8dcc58554cbfd011275f243fdc72304203d63b007ac9470ed0f3ce2f5a45e18614b52374f6f77a2759c3652e3041d6f9ed749899f344bf12ea08e8e3
+  metadata.gz: 32144972575f671e74215503ad1bd7fde30e80aa23724eb1c7a25d2e2c95860f969f3b775dd7838c785b34c871ad3a4c525365837d823fa932b84b87b57899d4
+  data.tar.gz: c2e27021d50cd84a14487cd500d8d262b0fd1b9f4aa5dd9be2962217205f086a78cedb75343010635eaed09d9540436a53ee7d90fa72e6e287df4a506f22d893

data/CHANGELOG

@@ -1,3 +1,9 @@
+= 3.4.29
+- fix for search_ui :multi_select on non-association column and non integer options
+- ensure id for radio button is valid
+- check foregin_type present, not only nil, on polymorphic associations
+
+= 3.4.28
 - don't stop on first associated record with error
 - compatibility fix for composite primary keys gem
 - fix double columns output on json and xml formats

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -717,15 +717,9 @@ var ActiveScaffold = {
   scroll_to: function(element, checkInViewport) {
     if (typeof checkInViewport == 'undefined') checkInViewport = true;
     if (typeof(element) == 'string') element = '#' + element;
-    var form_offset = jQuery(element).offset().top;
-    if (checkInViewport) {
-        var docViewTop = jQuery(window).scrollTop(),
-            docViewBottom = docViewTop + jQuery(window).height();
-        // If it's in viewport , don't scroll;
-        if (form_offset + jQuery(element).height() <= docViewBottom && form_offset >= docViewTop) return;
-    }
-
-    jQuery(document).scrollTop(form_offset);
+    element = jQuery(element);
+    if (checkInViewport && element.visible()) return;
+    jQuery(document).scrollTop(element.offset().top);
   },
 
   process_checkbox_inplace_edit: function(checkbox, options) {

data/lib/active_scaffold/attribute_params.rb

@@ -176,7 +176,7 @@ module ActiveScaffold
         if value.present?
           if column.polymorphic_association?
             class_name = parent_record.send(column.association.foreign_type)
-            class_name.constantize.find(value) if class_name
+            class_name.constantize.find(value) if class_name.present?
           else
             # it's a single id
             column.association.klass.find(value)

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -383,7 +383,7 @@ module ActiveScaffold
             text, value = active_scaffold_translated_option(column, text, value)
           end
 
-          radio_options = html_options.merge(id_key => html_options[id_key] + '-' + value.to_s)
+          radio_options = html_options.merge(id_key => html_options[id_key] + '-' + value.to_s.parameterize)
           radio_options.merge!(checked) if checked
           html << content_tag(:label, radio_button(:record, column.name, value, radio_options) + text)
         end.html_safe

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -77,11 +77,13 @@ module ActiveScaffold
         record ||= @record # TODO: Remove when relying on @record is removed
         associated = options.delete :value
         associated = [associated].compact unless associated.is_a? Array
-        associated.collect!(&:to_i)
 
         if column.association
+          associated.collect!(&:to_i)
           method = column.options[:label_method] || :to_label
-          select_options = sorted_association_options_find(column.association, nil, record).collect { |r| [r.send(method), r.id] }
+          select_options = sorted_association_options_find(column.association, nil, record).collect do |r|
+            [r.send(method), r.id]
+          end
         else
           select_options = column.options[:options].collect do |text, value|
             active_scaffold_translated_option(column, text, value)

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 28
+    PATCH = 29
 
     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.28
+  version: 3.4.29
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman