aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/form_helper.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 8380993af8..7c8748d604 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -120,10 +120,11 @@ module ActionView
# form_for(name, object, options.merge(:builder => LabellingFormBuiler), &proc)
# end
#
- def form_for(object_name, object = nil, options = {}, &proc)
+ def form_for(object_name, *args, &proc)
raise ArgumentError, "Missing block" unless block_given?
+ options = args.last.is_a?(Hash) ? args.pop : {}
concat(form_tag(options.delete(:url) || {}, options.delete(:html) || {}), proc.binding)
- fields_for(object_name, object, options, &proc)
+ fields_for(object_name, *(args << options), &proc)
concat('</form>', proc.binding)
end
@@ -141,8 +142,10 @@ module ActionView
#
# Note: This also works for the methods in FormOptionHelper and DateHelper that are designed to work with an object as base.
# Like collection_select and datetime_select.
- def fields_for(object_name, object = nil, options = {}, &proc)
+ def fields_for(object_name, *args, &proc)
raise ArgumentError, "Missing block" unless block_given?
+ options = args.last.is_a?(Hash) ? args.pop : {}
+ object = args.first
yield((options[:builder] || FormBuilder).new(object_name, object, self, options, proc))
end