diff options
author | Amiel Martin <amiel@carnesmedia.com> | 2014-06-20 15:49:27 -0700 |
---|---|---|
committer | Amiel Martin <amiel@carnesmedia.com> | 2014-06-24 17:20:24 -0700 |
commit | 6b0e834a194d112585f41deba0a40780d68e38c6 (patch) | |
tree | feac948ca1c91cadc8c9361eeeb56f2bf1bcc965 /actionview/lib/action_view/helpers/form_helper.rb | |
parent | 5b23e31771b898cf5e715e72f75dd9427c0a0875 (diff) | |
download | rails-6b0e834a194d112585f41deba0a40780d68e38c6.tar.gz rails-6b0e834a194d112585f41deba0a40780d68e38c6.tar.bz2 rails-6b0e834a194d112585f41deba0a40780d68e38c6.zip |
Use #model_name on instances instead of classes
This allows rails code to be more confdent when asking for a model name, instead of having to ask for the class.
Rails core discussion here: https://groups.google.com/forum/#!topic/rubyonrails-core/ThSaXw9y1F8
Diffstat (limited to 'actionview/lib/action_view/helpers/form_helper.rb')
-rw-r--r-- | actionview/lib/action_view/helpers/form_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb index 789a413c8d..bd8e3b1973 100644 --- a/actionview/lib/action_view/helpers/form_helper.rb +++ b/actionview/lib/action_view/helpers/form_helper.rb @@ -1815,8 +1815,8 @@ module ActionView object = convert_to_model(@object) key = object ? (object.persisted? ? :update : :create) : :submit - model = if object.class.respond_to?(:model_name) - object.class.model_name.human + model = if object.respond_to?(:model_name) + object.model_name.human else @object_name.to_s.humanize end |