Naming helpers should first check if passed object responds to model_name #7293

Merged
merged 1 commit into from Aug 8, 2012
Jump to file or symbol
Failed to load files and symbols.
+3 −5
Diff settings

Always

Just for now

@@ -300,11 +300,9 @@ 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 : 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