kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Simplify form_for by removing *args and extract_options! (at asakusa.rb)

This commit is contained in:
wycats 2010-08-31 20:59:30 +09:00
parent e0e3adff03
commit 74b49e87bb
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,31 +293,32 @@ module ActionView
# #
# If you don't need to attach a form to a model instance, then check out # If you don't need to attach a form to a model instance, then check out
# FormTagHelper#form_tag. # FormTagHelper#form_tag.
def form_for(record_or_name_or_array, *args, &proc) def form_for(record, record_object = nil, options = nil, &proc)
raise ArgumentError, "Missing block" unless block_given? raise ArgumentError, "Missing block" unless block_given?
options = args.extract_options! options, record_object = record_object, nil if record_object.is_a?(Hash)
options ||= {}
case record_or_name_or_array case record
when String, Symbol when String, Symbol
ActiveSupport::Deprecation.warn("Using form_for(:name, @resource) is deprecated. Please use form_for(@resource, :as => :name) instead.", caller) unless args.empty? ActiveSupport::Deprecation.warn("Using form_for(:name, @resource) is deprecated. Please use form_for(@resource, :as => :name) instead.", caller) if record_object
object_name = record_or_name_or_array object_name = record
object = record_object
when Array when Array
object = record_or_name_or_array.last object = record.last
object_name = options[:as] || ActiveModel::Naming.param_key(object) object_name = options[:as] || ActiveModel::Naming.singular(object)
apply_form_for_options!(record_or_name_or_array, options) apply_form_for_options!(record, options)
args.unshift object
else else
object = record_or_name_or_array object = record
object_name = options[:as] || ActiveModel::Naming.param_key(object) object_name = options[:as] || ActiveModel::Naming.singular(object)
apply_form_for_options!([object], options) apply_form_for_options!([object], options)
args.unshift object
end end
(options[:html] ||= {})[:remote] = true if options.delete(:remote) options[:html] ||= {}
options[:html][:remote] = options.delete(:remote)
output = form_tag(options.delete(:url) || {}, options.delete(:html) || {}) output = form_tag(options.delete(:url) || {}, options.delete(:html) || {})
output << fields_for(object_name, *(args << options), &proc) output << fields_for(object_name, object, options, &proc)
output.safe_concat('</form>') output.safe_concat('</form>')
end end