Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

association creates blank select if collection is nil

closes #595
  • Loading branch information...
commit 1cf06d3a7ec5cb836c1194d2cd1be241508a889f 1 parent 840d115
@nashby authored
View
4 lib/simple_form/form_builder.rb
@@ -174,7 +174,9 @@ def association(association, options={}, &block)
raise "Association #{association.inspect} not found" unless reflection
options[:as] ||= :select
- options[:collection] ||= reflection.klass.all(reflection.options.slice(:conditions, :order))
+ options[:collection] ||= options.fetch(:collection) {
+ reflection.klass.all(reflection.options.slice(:conditions, :order))
+ }
attribute = case reflection.macro
when :belongs_to
View
6 test/form_builder/association_test.rb
@@ -79,6 +79,12 @@ def with_association_for(object, *args)
assert_select 'form select option[value=3]', 'Company 3'
end
+ test 'builder creates blank select if collection is nil' do
+ with_association_for @user, :company, :collection => nil
+ assert_select 'form select.select#user_company_id'
+ assert_no_select 'form select option[value=1]', 'Company 1'
+ end
+
test 'builder allows collection radio for belongs_to associations' do
with_association_for @user, :company, :as => :radio_buttons
assert_select 'form input.radio_buttons#user_company_id_1'
Please sign in to comment.
Something went wrong with that request. Please try again.