active_scaffold 3.4.27 → 3.4.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48dc2381977713791be4113ae363aec520dbc8e0
-  data.tar.gz: 98506d01af1b998e7692b1bf5c7ca1a720686a5a
+  metadata.gz: efbb6369eb3a5aa9cb4309e764850525ba2e46c2
+  data.tar.gz: 3acbbbe42eea4e99a3039eb36c9aeaab50bb9f1e
 SHA512:
-  metadata.gz: 5f6740e7329844cbd546da3bc5738063bdb35ae794479cd5168d9cca99f0333f38644291a97d67d53104a517d55811f02771b410d2c0dc1991d7c7c2a86280c2
-  data.tar.gz: 0f1ef0aa8d699221e6dec5b71a4ff0669dfde7adbc3cb7c9d0f7428fe027dbc321cbc9a394254fe6f15b15a6ae9f8c06bf2277cdf6cbb60c747cfb2cdce51d7f
+  metadata.gz: 679592e18cba2f389ee6c7edaeab510c6ae761f51eedebb8f28846aaedb3e4265da572dae80b14aba23e74e34f63b07792efe6388335121b0c9bdcb612434f42
+  data.tar.gz: 2c30a66c8dcc58554cbfd011275f243fdc72304203d63b007ac9470ed0f3ce2f5a45e18614b52374f6f77a2759c3652e3041d6f9ed749899f344bf12ea08e8e3

data/CHANGELOG

@@ -1,3 +1,8 @@
+- 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
+- fix for search_ui :multi_select on non-association column
+
 = 3.4.27
 - support use_html option in columns for inplace_edit
 - don't add errors added on update_record_from_params to flash[:warning], they are on errors array, keep errors from update_record_from_params when running valid?

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

@@ -2,7 +2,7 @@
 record = list_record if local_assigns[:list_record] # compat with render :partial :collection
 columns ||= list_columns
 row_id ||= element_row_id(:action => :list, :id => record.id)
-tr_class = cycle("", "even-record") + ' ' + list_row_class(record)
+tr_class = "#{cycle("", "even-record")} #{list_row_class(record)}"
 action_links ||= active_scaffold_config.action_links.member
 data_refresh ||= record.to_param
 -%>

data/lib/active_scaffold/actions/core.rb

@@ -365,7 +365,7 @@ module ActiveScaffold::Actions
     end
 
     def virtual_columns(columns)
-      columns.reject { |col| active_scaffold_config.model.columns_hash[col] || active_scaffold_config.model.reflect_on_association(col) }
+      columns.reject { |col| active_scaffold_config.model.columns_hash[col.to_s] || active_scaffold_config.model.reflect_on_association(col) }
     end
 
     def association_columns(columns)

data/lib/active_scaffold/attribute_params.rb

@@ -109,7 +109,7 @@ module ActiveScaffold
           elsif attributes.key? column.name
             value = update_column_from_params(parent_record, column, attributes[column.name], avoid_changes)
           end
-        rescue StandardError => e
+        rescue => e
           logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} for #{parent_record.inspect}#{" with value #{value}" if value}"
           raise
         end

data/lib/active_scaffold/core.rb

@@ -56,7 +56,9 @@ module ActiveScaffold
 
             # sneak the action links from the actions into the main set
             if link.is_a? Array
-              link.each { |current| active_scaffold_config.action_links.add_to_group(current, active_scaffold_config.send(mod).action_group) }
+              link.each do |current_link|
+                active_scaffold_config.action_links.add_to_group(current_link, active_scaffold_config.send(mod).action_group)
+              end
             elsif link.is_a? ActiveScaffold::DataStructures::ActionLink
               active_scaffold_config.action_links.add_to_group(link, active_scaffold_config.send(mod).action_group)
             end

data/lib/active_scaffold/extensions/reverse_associations.rb

@@ -66,7 +66,11 @@ module ActiveScaffold
 
             # otherwise, match them based on the foreign_key
             when 0
-              next unless assoc.foreign_key.to_sym == foreign_key.to_sym
+              if assoc.foreign_key.is_a? Array
+                next unless assoc.foreign_key.to_sym == foreign_key.to_sym
+              else
+                next unless assoc.foreign_key.to_sym == foreign_key.to_sym
+              end
           end
 
           reverse_matches << assoc

data/lib/active_scaffold/extensions/unsaved_associated.rb

@@ -57,15 +57,16 @@ class ActiveRecord::Base
   # returns false if any yield returns false.
   # returns true otherwise, even when none of the associations have been instantiated. build wrapper methods accordingly.
   def with_unsaved_associated
-    associations_for_update.all? do |assoc|
+    associations_for_update.map do |assoc|
       association_proxy = association(assoc.name)
       if association_proxy.target.present?
         records = association_proxy.target
         records = [records] unless records.is_a? Array # convert singular associations into collections for ease of use
-        records.select { |r| r.unsaved? && !r.readonly? }.all? { |r| yield r } # must use select instead of find_all, which Rails overrides on association proxies for db access
+        # must use select instead of find_all, which Rails overrides on association proxies for db access
+        records.select { |r| r.unsaved? && !r.readonly? }.map { |r| yield r }.all?
       else
         true
       end
-    end
+    end.all?
   end
 end

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -310,8 +310,10 @@ module ActiveScaffold
 
       def active_scaffold_checkbox_option(option, label_method, associated_ids, checkbox_options, li_options = {})
         content_tag(:li, li_options) do
-          check_box_tag(checkbox_options[:name], option.id, associated_ids.include?(option.id), checkbox_options) <<
-            content_tag(:label, option.send(label_method), :for => checkbox_options[:id])
+          option_id = option.is_a?(Array) ? option[1] : option.id
+          label = option.is_a?(Array) ? option[0] : option.send(label_method)
+          check_box_tag(checkbox_options[:name], option_id, associated_ids.include?(option_id), checkbox_options) <<
+            content_tag(:label, label, :for => checkbox_options[:id])
         end
       end
 

data/lib/active_scaffold/version.rb

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