[merb-admin] Datamapper tweaks. Added support for namespaced models.

merbjedi · Oct 17, 2009 · 8139e22 · 8139e22 · sferik · Oct 17, 2009
1 parent 183e09a
commit 8139e22
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/abstract_model.rb b/lib/abstract_model.rb
@@ -19,7 +19,7 @@ def self.all
         end
         @models.sort!{|a, b| a.model.to_s <=> b.model.to_s}
       when :datamapper
-        DataMapper::Resource.descendants.each do |m|
+        DataMapper::Model.descendants.each do |m|
           # Remove DataMapperSessionStore because it's included by default
           next if m == Merb::DataMapperSessionStore if Merb.const_defined?(:DataMapperSessionStore)
           model = lookup(m.to_s.to_sym)
@@ -34,7 +34,7 @@ def self.all
     # Given a symbol +model_name+, finds the corresponding model class
     def self.lookup(model_name)
       begin
-        model = const_get(model_name)
+        model = Object.full_const_get(model_name.to_s)
       rescue NameError
         raise "MerbAdmin could not find model #{model_name}"
       end