No need to check model_name anymore

rails · Aug 18, 2014 · 8742bc9 · 8742bc9
1 parent d2d8098
commit 8742bc9
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb
@@ -304,12 +304,10 @@ def self.param_key(record_or_class)
     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