diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-07-20 01:28:15 +0900 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-07-20 01:30:49 +0900 |
| commit | f2f5cdc8bcd9df3a297ea02b80dbdb21790de732 (patch) | |
| tree | 3b665d8f9f6996bc703c88d05a7501395a0f6af1 /actionpack/lib | |
| parent | b00cac4adc0413418ffd2c59b52c8f64acff406b (diff) | |
| download | rails-f2f5cdc8bcd9df3a297ea02b80dbdb21790de732.tar.gz rails-f2f5cdc8bcd9df3a297ea02b80dbdb21790de732.tar.bz2 rails-f2f5cdc8bcd9df3a297ea02b80dbdb21790de732.zip | |
Rename ActiveRecordHelper to ActiveModelHelper
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers.rb | 4 | ||||
| -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.rb | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb index 97fa2d80e9..c1c0eb59ae 100644 --- a/actionpack/lib/action_view/helpers.rb +++ b/actionpack/lib/action_view/helpers.rb @@ -1,6 +1,6 @@ module ActionView #:nodoc: module Helpers #:nodoc: - autoload :ActiveRecordHelper, 'action_view/helpers/active_record_helper' + autoload :ActiveModelHelper, 'action_view/helpers/active_model_helper' autoload :AssetTagHelper, 'action_view/helpers/asset_tag_helper' autoload :AtomFeedHelper, 'action_view/helpers/atom_feed_helper' autoload :BenchmarkHelper, 'action_view/helpers/benchmark_helper' @@ -31,7 +31,7 @@ module ActionView #:nodoc: include SanitizeHelper::ClassMethods end - include ActiveRecordHelper + include ActiveModelHelper include AssetTagHelper include AtomFeedHelper include BenchmarkHelper 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 |