diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-08-17 23:02:27 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-08-17 23:02:27 -0300 |
| commit | 8742bc9d5e030b4ac6119d61a163ba72c2e7e380 (patch) | |
| tree | 66246aa9d13d7d9c6e6ff3df3a4b2410520101ed /activemodel | |
| parent | d2d809868c3eeb4d4a964382fc3df15cd5da70e4 (diff) | |
| download | rails-8742bc9d5e030b4ac6119d61a163ba72c2e7e380.tar.gz rails-8742bc9d5e030b4ac6119d61a163ba72c2e7e380.tar.bz2 rails-8742bc9d5e030b4ac6119d61a163ba72c2e7e380.zip | |
No need to check model_name anymore
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/naming.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb index d9ec502f88..4e6b02c246 100644 --- a/activemodel/lib/active_model/naming.rb +++ b/activemodel/lib/active_model/naming.rb @@ -304,12 +304,10 @@ module ActiveModel end def self.model_name_from_record_or_class(record_or_class) #:nodoc: - if record_or_class.respond_to?(:model_name) - record_or_class.model_name - elsif record_or_class.respond_to?(:to_model) + if record_or_class.respond_to?(:to_model) record_or_class.to_model.model_name else - record_or_class.class.model_name + record_or_class.model_name end end private_class_method :model_name_from_record_or_class |