提交 33aaa15f 编写于 作者: E Ernie Miller 提交者: José Valim

Convert to model before calling model_name on a record in ActiveModel::Naming

Signed-off-by: NJosé Valim <jose.valim@gmail.com>
上级 b7c49ced
......@@ -129,7 +129,11 @@ def self.param_key(record_or_class)
private
def self.model_name_from_record_or_class(record_or_class)
(record_or_class.is_a?(Class) ? record_or_class : record_or_class.class).model_name
(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
end
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册