Ticket #4477: newforms-admin-5427-app_grouping.diff

django/contrib/admin/sites.py

@@ -5 +5 @@
 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
@@ -234 +235 @@
         Displays the main admin index page, which lists all of the installed
         apps that have been registered in this site.
         """
-        app_list = []
+        app_dict = SortedDict()
         user = request.user
         for model, model_admin in self._registry.items():
             app_label = model._meta.app_label
             has_module_perms = user.has_module_perms(app_label)
+
             if has_module_perms:
                 perms = {
                     'add': user.has_perm("%s.%s" % (app_label, model._meta.get_add_permission())),
@@ -254 +256 @@
                         '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_dict.has_key( app_label ):
+                        app_dict[app_label]['models'].append( model_dict )
+                    else:
+                        app_dict[app_label] = {
+                            'name': app_label.title(),
+                            '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': app_dict.values(),
         }, context_instance=template.RequestContext(request))
 
 # This global object represents the default admin site, for the common case.