TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Configuration values should be on AV::Base.

Browse Source
This commit is contained in:
José Valim 2010-02-02 11:32:28 +01:00
parent ec4b18ec78
commit 95eadb39bd
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
actionpack/lib/action_view/helpers/form_helper.rb
View File

@ -528,7 +528,7 @@ def fields_for(record_or_name_or_array, *args, &block)
object_name = ActionController::RecordIdentifier.singular_class_name(object) object_name = ActionController::RecordIdentifier.singular_class_name(object)
end end
builder = options[:builder] || ActionView.default_form_builder builder = options[:builder] || ActionView::Base.default_form_builder
yield builder.new(object_name, object, self, options, block) yield builder.new(object_name, object, self, options, block)
end end
@ -1208,21 +1208,8 @@ def nested_child_index(name)
end end
end end
class << ActionView class Base
attr_accessor :default_form_builder cattr_accessor :default_form_builder
end @@default_form_builder = ::ActionView::Helpers::FormBuilder
self.default_form_builder = ::ActionView::Helpers::FormBuilder
# 2.3 compatibility
class << Base
def default_form_builder=(builder)
ActionView.default_form_builder = builder
end
def default_form_builder
ActionView.default_form_builder
end end
end end
end

6
actionpack/test/template/form_helper_test.rb
View File

@ -1195,8 +1195,8 @@ def test_form_for_with_labelled_builder
end end
def test_default_form_builder def test_default_form_builder
old_default_form_builder, ActionView.default_form_builder = old_default_form_builder, ActionView::Base.default_form_builder =
ActionView.default_form_builder, LabelledFormBuilder ActionView::Base.default_form_builder, LabelledFormBuilder
form_for(:post, @post) do |f| form_for(:post, @post) do |f|
concat f.text_field(:title) concat f.text_field(:title)
@ -1213,7 +1213,7 @@ def test_default_form_builder
assert_dom_equal expected, output_buffer assert_dom_equal expected, output_buffer
ensure ensure
ActionView.default_form_builder = old_default_form_builder ActionView::Base.default_form_builder = old_default_form_builder
end end
def test_default_form_builder_with_active_record_helpers def test_default_form_builder_with_active_record_helpers