Ticket #11895: sites.diff

sites.py

@@ -49 +49 @@
         self.app_name = app_name
         self._actions = {'delete_selected': actions.delete_selected}
         self._global_actions = self._actions.copy()
+        self.apps = []
 
     def register(self, model_or_iterable, admin_class=None, **options):
         """
@@ -349 +350 @@
                         app_dict[app_label]['models'].append(model_dict)
                     else:
                         app_dict[app_label] = {
+                            'app_label': app_label,
                             'name': app_label.title(),
                             'app_url': app_label + '/',
                             'has_module_perms': has_module_perms,
@@ -362 +364 @@
         # Sort the models alphabetically within each app.
         for app in app_list:
             app['models'].sort(lambda x, y: cmp(x['name'], y['name']))
-
+        
+        # Assign Apps to Groups
+        for group in self.apps:
+            application_list = []
+            for app in group['apps']:
+                try:
+                    application_list.append(app_dict[app])
+                    # remove assigned app from app_list
+                    app_list = [d for d in app_list if d.get('app_label') != app]
+                except:
+                    pass
+            group['applications'] = application_list
+        
         context = {
             'title': _('Site administration'),
             'app_list': app_list,
             'root_path': self.root_path,
+            'group_list': self.apps,
         }
         context.update(extra_context or {})
         context_instance = template.RequestContext(request, current_app=self.name)