ignore models that are abstract

sphw · Oct 19, 2011 · e42ecbd · e42ecbd
1 parent 849898f
commit e42ecbd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/rails_admin/abstract_model.rb b/lib/rails_admin/abstract_model.rb
@@ -29,12 +29,15 @@ def self.all_models
 
     # Given a string +model_name+, finds the corresponding model class
     def self.lookup(model_name)
-      begin
-        (model = model_name.constantize rescue nil) && model.is_a?(Class) && (superclasses(model).include?(ActiveRecord::Base) ? model : nil) || nil
-      rescue LoadError
-        Rails.logger.error "Error while loading '#{model_name}': #{$!}"
+      model = model_name.constantize rescue nil
+      if model && model.is_a?(Class) && superclasses(model).include?(ActiveRecord::Base) && !model.abstract_class?
+        model
+      else
         nil
       end
+    rescue LoadError
+      Rails.logger.error "Error while loading '#{model_name}': #{$!}"
+      nil
     end
 
     def initialize(model)

diff --git a/spec/dummy_app/app/models/abstract.rb b/spec/dummy_app/app/models/abstract.rb
@@ -0,0 +1,5 @@
+class Abstract < ActiveRecord::Base
+
+  self.abstract_class = true
+
+end