Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Clean up style around form_for and friends a bit

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3573 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit a04a849d155997d0c3a6fcae4688a45c421e7a00 1 parent 344ae83
@dhh dhh authored
View
11 actionpack/lib/action_view/helpers/form_helper.rb
@@ -121,9 +121,10 @@ module FormHelper
# 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 @@ def form_for(object_name, object, options = {}, &proc)
# 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
View
4 actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -172,9 +172,9 @@ def form_remote_tag(options = {})
# 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
Please sign in to comment.
Something went wrong with that request. Please try again.