Ticket #4326: django_new_admin_bug_fixed.patch

django/contrib/admin/sites.py

@@ -2 +2 @@
 from django.contrib.admin import ModelAdmin
 from django.contrib.auth import authenticate, login
 from django.db.models import Model
+from django.db.models.base import ModelBase
 from django.shortcuts import render_to_response
 from django.utils.text import capfirst
 from django.utils.translation import gettext_lazy
+from django.utils.datastructures import SortedDict
 import base64
 import cPickle as pickle
 import datetime
@@ -53 +55 @@
 
 class AdminSite(object):
     def __init__(self):
-        self._registry = {} # model_class class -> admin_class instance
+        self._registry = SortedDict() # model_class class -> admin_class instance
 
     def register(self, model_or_iterable, admin_class=None, **options):
         """
@@ -69 +71 @@
         """
         admin_class = admin_class or ModelAdmin
         # TODO: Handle options
-        if issubclass(model_or_iterable, Model):
+        if isinstance(model_or_iterable, ModelBase) and issubclass(model_or_iterable, Model):
             model_or_iterable = [model_or_iterable]
         for model in model_or_iterable:
             if model in self._registry:
-                raise AlreadyRegistered('The model %s is already registered' % model.__class__.__name__)
+                raise AlreadyRegistered('The model %s is already registered' % model.__name__)
+            model._meta.admin = admin_class
             self._registry[model] = admin_class(model)
 
     def unregister(self, model_or_iterable):
@@ -234 +237 @@
         Displays the main admin index page, which lists all of the installed
         apps that have been registered in this site.
         """
-        app_list = []
+        apps = SortedDict()
         user = request.user
         for model, model_admin in self._registry.items():
             app_label = model._meta.app_label
@@ -254 +257 @@
                         'admin_url': '%s/%s/' % (app_label, model.__name__.lower()),
                         'perms': perms,
                     }
-                    app_list.append({
-                        'name': app_label.title(),
-                        'has_module_perms': has_module_perms,
-                        'models': [model_dict],
-                    })
+                    if app_label in apps:
+                        apps[app_label]['models'].append(model_dict)
+                    else:
+                        apps[app_label] = {
+                            'name': app_label.title(),
+                            # I found that this isn't used in template.
+                            #'has_module_perms': has_module_perms,
+                            'models': [model_dict],
+                        }
         return render_to_response('admin/index.html', {
             'title': _('Site administration'),
-            'app_list': app_list,
+            'app_list': apps.values(),
         }, context_instance=template.RequestContext(request))
 
 # This global object represents the default admin site, for the common case.