Skip to content

Commit 4f6283a

Browse files
committed
Merged in [9513] from rjsparks@nostrum.com:
Don't show concluded groups in the community list section of the navbar. Fixes bug ietf-tools#1652. - Legacy-Id: 9534 Note: SVN reference [9513] has been migrated to Git commit d1d7318
2 parents 42ca429 + d1d7318 commit 4f6283a

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

ietf/community/templatetags/community_tags.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def get_user_managed_lists(user):
1616
try:
1717
person = user.person
1818
groups = []
19-
managed_areas = [i.group for i in Role.objects.filter(name__slug='ad', email__in=person.email_set.all())]
19+
managed_areas = [i.group for i in Role.objects.filter(name__slug='ad', group__type__slug='area', group__state__slug='active', email__in=person.email_set.all())]
2020
for area in managed_areas:
2121
groups.append(CommunityList.objects.get_or_create(group=area)[0])
22-
managed_wg = [i.group for i in Role.objects.filter(name__slug='chair', group__type__slug='wg', email__in=person.email_set.all())]
22+
managed_wg = [i.group for i in Role.objects.filter(name__slug='chair', group__type__slug='wg', group__state__slug__in=('active','bof'), email__in=person.email_set.all())]
2323
for wg in managed_wg:
2424
groups.append(CommunityList.objects.get_or_create(group=wg)[0])
2525
lists['group'] = groups

ietf/templates/base/menu.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
{% if community_lists %}
5454
<li><a href="{{ community_lists.personal.get_manage_url }}">My tracked docs</a></li>
5555
{% for cl in community_lists.group %}
56-
<li><a href="{{ cl.get_manage_url }}">WG {{ cl.short_name }} docs</a></li>
56+
<li><a href="{{ cl.get_manage_url }}">{{ cl.short_name }} {{cl.group.type.slug}} docs</a></li>
5757
{% endfor %}
5858
{% else %}
5959
<li><a rel="nofollow" href="/accounts/login/?next={{request.get_full_path|urlencode}}">Sign in to track docs</a></li>

0 commit comments

Comments
 (0)