diff options
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 11 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/prototype_helper.rb | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 81f6fec827..ab387b7bf8 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -121,9 +121,10 @@ module ActionView # end # def form_for(object_name, object, options = {}, &proc) - concat form_tag(options, options.delete(:html) || {}), proc.binding + raise ArgumentError, "Missing block" unless block_given? + concat(form_tag(options, options.delete(:html) || {}), proc.binding) fields_for(object_name, object, options, &proc) - concat '</form>', proc.binding + concat('</form>', proc.binding) end # Creates a scope around a specific model object like form_for, but doesn't create the form tags themselves. This makes @@ -141,10 +142,8 @@ 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, options = {}, &proc) - raise ArgumentError, "fields_for requires a block!" unless block_given? - builder_klass = options[:builder] || FormBuilder - form_builder = builder_klass.new(object_name, object, self, options, proc) - yield form_builder + raise ArgumentError, "Missing block" unless block_given? + yield (options[:builder] || FormBuilder).new(object_name, object, self, options, proc) end # Returns an input tag of the "text" type tailored for accessing a specified attribute (identified by +method+) on an object diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index 96f065cc11..8aabe04aac 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -172,9 +172,9 @@ module ActionView # Works like form_remote_tag, but uses form_for semantics. def remote_form_for(object_name, object, options = {}, &proc) - concat form_remote_tag(options), proc.binding + concat(form_remote_tag(options), proc.binding) fields_for(object_name, object, options, &proc) - concat '</form>', proc.binding + concat('</form>', proc.binding) end alias_method :form_remote_for, :remote_form_for |