aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-07-20 01:28:15 +0900
committerYehuda Katz <wycats@gmail.com>2009-07-20 01:30:49 +0900
commitf2f5cdc8bcd9df3a297ea02b80dbdb21790de732 (patch)
tree3b665d8f9f6996bc703c88d05a7501395a0f6af1 /actionpack/lib/action_view/helpers
parentb00cac4adc0413418ffd2c59b52c8f64acff406b (diff)
downloadrails-f2f5cdc8bcd9df3a297ea02b80dbdb21790de732.tar.gz
rails-f2f5cdc8bcd9df3a297ea02b80dbdb21790de732.tar.bz2
rails-f2f5cdc8bcd9df3a297ea02b80dbdb21790de732.zip
Rename ActiveRecordHelper to ActiveModelHelper
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r--actionpack/lib/action_view/helpers/active_model_helper.rb (renamed from actionpack/lib/action_view/helpers/active_record_helper.rb)2
-rw-r--r--actionpack/lib/action_view/helpers/form_helper.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/active_record_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index 409b27de73..0f122d9232 100644
--- a/actionpack/lib/action_view/helpers/active_record_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -15,7 +15,7 @@ module ActionView
# method that creates a complete form for all the basic content types of the record (not associations or aggregations, though). This
# is a great way of making the record quickly available for editing, but likely to prove lackluster for a complicated real-world form.
# In that case, it's better to use the +input+ method and the specialized +form+ methods in link:classes/ActionView/Helpers/FormHelper.html
- module ActiveRecordHelper
+ module ActiveModelHelper
# Returns a default input tag for the type of object returned by the method. For example, if <tt>@post</tt>
# has an attribute +title+ mapped to a +VARCHAR+ column that holds "Hello World":
#
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 2b39d08035..2d1d19d5f3 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -1044,8 +1044,6 @@ module ActionView
end
def fields_for_nested_model(name, object, args, block)
- object = convert_to_model(object)
-
if object.new_record?
@template.fields_for(name, object, *args, &block)
else