Ticket #1253: doc.py.diff

doc.py

@@ -137 +137 @@
     if not utils.docutils_is_available:
         return missing_docutils_page(request)
 
-    models = []
+    m = []
     for app in models.get_installed_model_modules():
         for model in app._MODELS:
             opts = model._meta
-            models.append({
-                'name': '%s.%s' % (opts.app_label, opts.module_name),
+            m.append({
+                'name': '%s.%s' % (model.__module__, model.__name__),
                 'module': opts.app_label,
                 'class': opts.module_name,
             })
-    return render_to_response('admin_doc/model_index', {'models': models}, context_instance=RequestContext(request))
+    return render_to_response('admin_doc/model_index', {'models': m}, context_instance=RequestContext(request))
 model_index = staff_member_required(model_index)
 
 def model_detail(request, model):
@@ -154 +154 @@
         return missing_docutils_page(request)
 
     try:
-        model = models.get_app(model)
+        comp = model.split('.')
+        modulename = '.'.join(comp[:-1])
+        modelname = comp[-1]
+        mod = __import__(modulename, '', '', [''])
+        model = getattr(mod, modelname)
     except ImportError:
         raise Http404
-    opts = model.Klass._meta
+    opts = model._meta
 
     # Gather fields/field descriptions
     fields = []
@@ -168 +172 @@
             'verbose': field.verbose_name,
             'help': field.help_text,
         })
-    for func_name, func in model.Klass.__dict__.items():
-        if callable(func) and len(inspect.getargspec(func)[0]) == 0:
+    for func_name, func in model.__dict__.items():
+        if (inspect.isfunction(func) or inspect.ismethod(func)) and len(inspect.getargspec(func)[0]) == 0:
             try:
                 for exclude in MODEL_METHODS_EXCLUDE:
                     if func_name.startswith(exclude):