active_scaffold 3.1.12 → 3.1.13

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

@@ -49,7 +49,7 @@ class ActiveScaffold::Bridges::RecordSelect
       
       def active_scaffold_record_select_autocomplete(column, options)
         record_select_options = active_scaffold_input_text_options(options).merge(
-          :controller => remote_controller
+          :controller => active_scaffold_controller_for(@record.class).controller_path
         )
         html = record_select_autocomplete(options[:name], @record, record_select_options)
         html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?

data/lib/active_scaffold/bridges/record_select/helpers.rb~

@@ -33,17 +33,10 @@ class ActiveScaffold::Bridges::RecordSelect
           params.merge!({column.association.primary_key_name => ''})
         end
  
-        record_select_options = active_scaffold_input_text_options(
-          :controller => remote_controller,
-          :id => options[:id],
-          :class => options[:class].gsub(/update_form/, '')
+        record_select_options = active_scaffold_input_text_options(options).merge(
+          :controller => remote_controller
         )
         record_select_options.merge!(column.options)
-        if options['data-update_url']
-          record_select_options[:onchange] = %|function(id, label) {
-              ActiveScaffold.update_column(null, "#{options['data-update_url']}", #{options['data-update_send_form'].to_json}, "#{options[:id]}", id);
-            }|
-        end
  
         html = if multiple
           record_multi_select_field(options[:name], value || [], record_select_options)
@@ -55,18 +48,11 @@ class ActiveScaffold::Bridges::RecordSelect
       end
       
       def active_scaffold_record_select_autocomplete(column, options)
-        record_select_options = active_scaffold_input_text_options(
-          :controller => active_scaffold_controller_for(@record.class).controller_path,
-          :id => options[:id],
-          :class => options[:class].gsub(/update_form/, '')
+        remote_controller = active_scaffold_controller_for(column.association.klass).controller_path
+        record_select_options = active_scaffold_input_text_options(options).merge(
+          :controller => remote_controller
         )
-        if options['data-update_url']
-          record_select_options[:onchange] = %|function(id, label) {
-              ActiveScaffold.update_column(null, "#{options['data-update_url']}", #{options['data-update_send_form'].to_json}, "#{options[:id]}", id);
-            }|
-        end
-
-        html = record_select_autocomplete(options[:name], value, record_select_options)
+        html = record_select_autocomplete(options[:name], @record, record_select_options)
         html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?
         html
       end

data/lib/active_scaffold/extensions/active_association_reflection.rb

@@ -5,7 +5,7 @@
 ActiveRecord::Reflection::AssociationReflection.class_eval do
   def klass_with_sti(*opts)
     sti_col = klass.inheritance_column
-    if (h = opts.first).is_a? Hash and (passed_type = ( h[sti_col] || h[sti_col.to_sym] )) and (new_klass = active_record.send(:compute_type, passed_type)) < klass
+    if sti_col and (h = opts.first).is_a? Hash and (passed_type = ( h[sti_col] || h[sti_col.to_sym] )) and (new_klass = active_record.send(:compute_type, passed_type)) < klass
       new_klass
     else
       klass

data/lib/active_scaffold/extensions/active_association_reflection.rb~

@@ -0,0 +1,22 @@
+# Bugfix: building an sti model from an association fails
+# https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/6306-collection-associations-build-method-not-supported-for-sti
+# https://github.com/rails/rails/issues/815
+# https://github.com/rails/rails/pull/1686
+ActiveRecord::Reflection::AssociationReflection.class_eval do
+  def klass_with_sti(*opts)
+    sti_col = klass.inheritance_column
+    if (h = opts.first).is_a? Hash and (passed_type = ( h[sti_col] || h[sti_col.to_sym] )) and (new_klass = active_record.send(:compute_type, passed_type)) < klass
+      new_klass
+    else
+      klass
+    end
+  end
+  def build_association(*opts, &block)
+    self.original_build_association_called = true
+    klass_with_sti(*opts).new(*opts, &block)
+  end
+  def create_association(*opts, &block)
+    self.original_build_association_called = true
+    klass_with_sti(*opts).create(*opts, &block)
+  end
+end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 1
-    PATCH = 12
+    PATCH = 13
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 3
   - 1
-  - 12
-  version: 3.1.12
+  - 13
+  version: 3.1.13
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-19 00:00:00 Z
+date: 2011-12-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -348,6 +348,7 @@ files:
 - lib/active_scaffold/extensions/reverse_associations.rb~
 - lib/active_scaffold/extensions/routing_mapper.rb~
 - lib/active_scaffold/extensions/unsaved_associated.rb~
+- lib/active_scaffold/extensions/active_association_reflection.rb~
 - lib/active_scaffold/paginator.rb
 - lib/active_scaffold/responds_to_parent.rb
 - lib/active_scaffold/version.rb