Skip to content

Commit 6d831b2

Browse files
committed
Merged in [14497] from rjsparks@nostrum.com:
Add navigation to nomcom pages for nomcom members. Put the RFC Status change link in a saner place in the navigation. Fixes ietf-tools#1411 and ietf-tools#2433. - Legacy-Id: 14501 Note: SVN reference [14497] has been migrated to Git commit 15d2329
2 parents b48996f + 15d2329 commit 6d831b2

2 files changed

Lines changed: 28 additions & 3 deletions

File tree

ietf/group/templatetags/group_filters.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
from django import template
22

3+
from ietf.group.models import Group
4+
35
register = template.Library()
46

57
@register.filter
@@ -10,3 +12,16 @@ def has_sessions(group,num):
1012
def active_roles(queryset):
1113
return queryset.filter(group__state_id__in=['active', 'bof']).exclude(group__acronym='secretariat')
1214

15+
@register.filter
16+
def active_nomcoms(user):
17+
if not (user and hasattr(user, "is_authenticated") and user.is_authenticated):
18+
return []
19+
20+
groups = []
21+
22+
groups.extend(Group.objects.filter(
23+
role__person__user=user,
24+
type_id='nomcom',
25+
state__slug='active').distinct().select_related("type"))
26+
27+
return groups

ietf/templates/base/menu.html

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
2-
{% load ietf_filters managed_groups wg_menu streams_menu active_groups_menu %}
2+
{% load ietf_filters managed_groups wg_menu streams_menu active_groups_menu group_filters %}
33

44
{% if flavor != "top" %}
55
{% include "base/menu_user.html" %}
@@ -52,6 +52,11 @@
5252
<li><a rel="nofollow" href="/accounts/login/?next={{ request.get_full_path|urlencode }}">Sign in to track docs</a></li>
5353
{% endif %}
5454

55+
{% if user|has_role:"Area Director,Secretariat" %}
56+
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
57+
<li><a href="{% url 'ietf.doc.views_status_change.rfc_status_changes' %}">RFC status changes</a></li>
58+
{% endif %}
59+
5560
{% if user|has_role:"WG Chair,RG Chair" %}
5661
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
5762
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>WG chair</li>
@@ -73,10 +78,15 @@
7378
{% endfor %}
7479
{% endif %}
7580

76-
{% if user|has_role:"Area Director,Secretariat" %}
81+
{% if user|active_nomcoms %}
7782
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
78-
<li><a href="{% url 'ietf.doc.views_status_change.rfc_status_changes' %}">RFC status changes</a></li>
83+
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>Nomcoms</li>
84+
{% for g in user|active_nomcoms %}
85+
<li><a href="{% url "ietf.nomcom.views.private_index" g.nomcom_set.first.year %}">{{ g.acronym|capfirst }}</a></li>
86+
{% endfor %}
7987
{% endif %}
88+
89+
8090
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
8191
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>RFC streams</li>
8292
<li><a href="{% url "ietf.group.views.stream_documents" acronym="iab" %}">IAB</a></li>

0 commit comments

Comments
 (0)