kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #7293 from Bertg/activemodel_naming_helpers_try_model_name_first

Browse source 
Naming helpers should first check if passed object responds to model_name
This commit is contained in:
Aaron Patterson 2012-08-08 16:09:39 -07:00
commit 2da242f63c
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
activemodel/lib/active_model/naming.rb
View file

@ -300,11 +300,9 @@ module ActiveModel
private
def self.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
end
def self.convert_to_model(object)
object.respond_to?(:to_model) ? object.to_model : object
return record_or_class.model_name if record_or_class.respond_to?(:model_name)
return record_or_class.to_model.class.model_name if record_or_class.respond_to?(:to_model)
record_or_class.class.model_name
end
end