aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/helpers/form_helper.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafael.franca@plataformatec.com.br>2014-08-17 23:01:13 -0300
committerRafael Mendonça França <rafael.franca@plataformatec.com.br>2014-08-17 23:01:13 -0300
commitd2d809868c3eeb4d4a964382fc3df15cd5da70e4 (patch)
tree4f790872d6cb202b235ed21fc3c5ade6c4511399 /actionview/lib/action_view/helpers/form_helper.rb
parent76883f92374c6395f13c16628e1d87d40b6d2399 (diff)
parent6b0e834a194d112585f41deba0a40780d68e38c6 (diff)
downloadrails-d2d809868c3eeb4d4a964382fc3df15cd5da70e4.tar.gz
rails-d2d809868c3eeb4d4a964382fc3df15cd5da70e4.tar.bz2
rails-d2d809868c3eeb4d4a964382fc3df15cd5da70e4.zip
Merge pull request #15889 from carnesmedia/model-name
Use #model_name on instances instead of classes
Diffstat (limited to 'actionview/lib/action_view/helpers/form_helper.rb')
-rw-r--r--actionview/lib/action_view/helpers/form_helper.rb4
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 c6bc0c9e38..0582cb3e12 100644
--- a/actionview/lib/action_view/helpers/form_helper.rb
+++ b/actionview/lib/action_view/helpers/form_helper.rb
@@ -1863,8 +1863,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