active_scaffold 3.5.3 → 3.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 177c474fcde86642099ba380b09ad4b3042a09c8e29b0ab400190628b426e92e
-  data.tar.gz: f38ba6290d4887a33d376bf03ba5ba0ea0e9fe19488e783543be999948614646
+  metadata.gz: e0a92ddd6c1b3401de801feb8488ec0e4a74d02eb91a7be59a9b28fe723c26f4
+  data.tar.gz: 832e014bbebf915d82c126ef5d552cf8f241461ca780dced5ec9df59771ae711
 SHA512:
-  metadata.gz: 5592eef658ad06e1a564d085c2db7501057cf49b3782c9e7da7d13a18d375ae7e812a3e400b3fc14cf6ddb15703bce206e7da9c81a397b8035eed2d3cc470c46
-  data.tar.gz: 54d1fdd3df68b78ad89595e0350d04a91b75b79d203ed478c4b638136b108d2d39834dabbd64971609641de621011cb761d8bafd3a22fbab3327cd880252b7ff
+  metadata.gz: 597fc2f0187a6c59e0f52f7a9a187ef85810f716334ee32fd37c362a21201c7b39111c39f8a5b29e9f4b38eb9702991e1a269e05062442f5157a2a0a9de1a815
+  data.tar.gz: dfad5b57b1bb177eaa1c8cc829a06fe85e1f4463605336fa5d67c1e3ad12c65cb285c15dbfcf2de04e9e0191c4fb172868dd2130f20a8a69b609fcf6790695d0

data/CHANGELOG

@@ -1,3 +1,8 @@
+= 3.5.4
+- Fix chosen form_ui for plural associations
+- Eager load with includes in association options query, if includes has a hash with own association key, see #612
+
+= 3.5.3
 - Fix :text fields for rails >= 5.1
 - Send empty array in collection associations with select form_ui (checkbox or draggable list) when no option is available
 

data/lib/active_scaffold/bridges/chosen/helpers.rb

@@ -12,10 +12,11 @@ class ActiveScaffold::Bridges::Chosen
       def active_scaffold_input_chosen(column, html_options)
         html_options[:class] << ' chosen'
         if column.association.try(:collection?)
-          associated_options, select_options = active_scaffold_plural_association_options(column)
-          options = {:selected => associated_options.collect(&:id), :include_blank => as_(:_select_)}
+          record = html_options.delete(:object)
+          associated_options, select_options = active_scaffold_plural_association_options(column, record)
+          options = {selected: associated_options.collect(&:id), include_blank: as_(:_select_), object: record}
 
-          html_options.update(:multiple => true).update(column.options[:html_options] || {})
+          html_options.update(multiple: true).update(column.options[:html_options] || {})
           options.update(column.options)
           active_scaffold_select_name_with_multiple html_options
 

data/lib/active_scaffold/helpers/association_helpers.rb

@@ -32,11 +32,11 @@ module ActiveScaffold
           klass = association_klass_scoped(association, klass, record)
           relation = klass.where(conditions)
           column = column_for_association(association, record)
-          if column && column.try(:sort) && column.sort[:sql]
-            if column.includes
-              include_assoc = column.includes.find { |assoc| assoc.is_a?(Hash) && assoc.include?(association.name) }
-              relation = relation.includes(include_assoc[association.name]) if include_assoc
-            end
+          if column && column.includes
+            include_assoc = column.includes.find { |assoc| assoc.is_a?(Hash) && assoc.include?(association.name) }
+            relation = relation.includes(include_assoc[association.name]) if include_assoc
+          end
+          if column && column.sort && column.sort[:sql]
             relation = relation.order(column.sort[:sql])
           end
           relation = yield(relation) if block_given?

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 5
-    PATCH = 3
+    PATCH = 4
 
     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.5.3
+  version: 3.5.4
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -430,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Rails 4.x and 5.x versions of ActiveScaffold supporting prototype and jquery