Ticket #4258: admin-index.diff

django/contrib/admin/sites.py

@@ -254 +254 @@
                         '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],
-                    })
+                    
+                    existing_app = False
+                    for app in app_list:
+                        if app['name'] == app_label.title():
+                            app['models'].append(model_dict)
+                            existing_app = True
+                    if not existing_app:
+                        app_list.append({
+                            'name': app_label.title(),
+                            'has_module_perms': has_module_perms,
+                            'models': [model_dict],
+                        })
+
+        # Sort apps and models
+        app_list.sort(lambda x, y: cmp(x['name'], y['name']))
+        for app in app_list:
+            app['models'].sort(lambda x, y: cmp(x['name'], y['name']))
+            
         return render_to_response('admin/index.html', {
             'title': _('Site administration'),
             'app_list': app_list,