-
Notifications
You must be signed in to change notification settings - Fork 21.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor FormBuilder arguments and default config
* Do not reopen AV::Base to define default form builder Inside the load hook we are already in AV::Base context. * Do not pass the given block to the form builder The block is evaluated in fields_for context using capture, with the builder as argument. This means we do not need to give the block to the FormBuilder itself.
- Loading branch information
1 parent
d4a9ce8
commit 56089ca
Showing
2 changed files
with
10 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -373,7 +373,7 @@ def form_for(record, options = {}, &proc) | |
options[:html][:method] = options.delete(:method) if options.has_key?(:method) | ||
options[:html][:authenticity_token] = options.delete(:authenticity_token) | ||
|
||
builder = options[:parent_builder] = instantiate_builder(object_name, object, options, &proc) | ||
builder = options[:parent_builder] = instantiate_builder(object_name, object, options) | ||
fields_for = fields_for(object_name, object, options, &proc) | ||
default_options = builder.multipart? ? { :multipart => true } : {} | ||
default_options.merge!(options.delete(:html)) | ||
|
@@ -601,7 +601,7 @@ def apply_form_for_options!(record, object, options) #:nodoc: | |
# ... | ||
# <% end %> | ||
def fields_for(record_name, record_object = nil, options = {}, &block) | ||
builder = instantiate_builder(record_name, record_object, options, &block) | ||
builder = instantiate_builder(record_name, record_object, options) | ||
output = capture(builder, &block) | ||
output.concat builder.hidden_field(:id) if output && options[:hidden_field_id] && !builder.emitted_hidden_id? | ||
output | ||
|
@@ -925,7 +925,7 @@ def range_field(object_name, method, options = {}) | |
|
||
private | ||
|
||
def instantiate_builder(record_name, record_object, options, &block) | ||
def instantiate_builder(record_name, record_object, options) | ||
case record_name | ||
when String, Symbol | ||
object = record_object | ||
|
@@ -936,7 +936,7 @@ def instantiate_builder(record_name, record_object, options, &block) | |
end | ||
|
||
builder = options[:builder] || ActionView::Base.default_form_builder | ||
builder.new(object_name, object, self, options, block) | ||
builder.new(object_name, object, self, options) | ||
end | ||
end | ||
|
||
|
@@ -967,9 +967,9 @@ def to_model | |
self | ||
end | ||
|
||
def initialize(object_name, object, template, options, proc) | ||
def initialize(object_name, object, template, options) | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
carlosantoniodasilva
Author
Member
|
||
@nested_child_index = {} | ||
@object_name, @object, @template, @options, @proc = object_name, object, template, options, proc | ||
@object_name, @object, @template, @options = object_name, object, template, options | ||
@parent_builder = options[:parent_builder] | ||
@default_options = @options ? @options.slice(:index, :namespace) : {} | ||
if @object_name.to_s.match(/\[\]$/) | ||
|
@@ -1183,9 +1183,6 @@ def convert_to_model(object) | |
end | ||
|
||
ActiveSupport.on_load(:action_view) do | ||
class ActionView::Base | ||
cattr_accessor :default_form_builder | ||
@@default_form_builder = ::ActionView::Helpers::FormBuilder | ||
end | ||
cattr_accessor(:default_form_builder) { ::ActionView::Helpers::FormBuilder } | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Can we keep the constructor signature the same, and emit a warning if someone passes in a proc? This borked my custom form builder subclass where I just call
super
. :(