kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Naming helpers should first check if passed object responds to model_name

This commit is contained in:
Bert Goethals 2012-08-08 22:40:06 +02:00
parent 4154bf012d
commit 920d9ee4d8
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