Expand the list of lists in a group when listing the group contents

Previously, we would show all list groups unexpanded, even if we knew
which group we were in.

diff --git a/django/archives/mailarchives/views.py b/django/archives/mailarchives/views.py
index e267fca0637d92e274db23ac39c1644c183f49f6..11f3883dac2f33b9b3b8be4830da88d944be89ca 100644 (file)
--- a/django/archives/mailarchives/views.py
+++ b/django/archives/mailarchives/views.py
@@ -61,18 +61,21 @@ def get_all_groups_and_lists(listid=None):
 
 
 class NavContext(RequestContext):
-       def __init__(self, request, listid=None, all_groups=None):
+       def __init__(self, request, listid=None, all_groups=None, expand_groupid=None):
                RequestContext.__init__(self, request)
 
                if all_groups:
                        groups = all_groups
+                       if expand_groupid:
+                               listgroupid = int(expand_groupid)
                else:
                        (groups, listgroupid) = get_all_groups_and_lists(listid)
+
                for g in groups:
                        # On the root page, remove *all* entries
                        # On other lists, remove the entries in all groups other than our
                        # own.
-                       if (not listid) or listgroupid != g['groupid']:
+                       if (not listid and not expand_groupid) or listgroupid != g['groupid']:
                                # Root page, so remove *all* entries
                                g['lists'] = []
 
@@ -97,7 +100,7 @@ def groupindex(request, groupid):
 
        return render_to_response('index.html', {
                        'groups': mygroups,
-                       }, NavContext(request, all_groups=groups))
+                       }, NavContext(request, all_groups=groups, expand_groupid=groupid))
 
 @cache(hours=8)
 def monthlist(request, listname):