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 /actionpack/lib/action_controller | |
| 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 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/model_naming.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/model_naming.rb b/actionpack/lib/action_controller/model_naming.rb index 785221dc3d..2b33f67263 100644 --- a/actionpack/lib/action_controller/model_naming.rb +++ b/actionpack/lib/action_controller/model_naming.rb @@ -6,7 +6,7 @@ module ActionController end def model_name_from_record_or_class(record_or_class) - (record_or_class.is_a?(Class) ? record_or_class : convert_to_model(record_or_class).class).model_name + convert_to_model(record_or_class).model_name end end end |