From 15d23299d87d9faeed9b1db2707dc7467fdbe7dc Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Tue, 9 Jan 2018 22:10:10 +0000 Subject: [PATCH] Add navigation to nomcom pages for nomcom members. Put the RFC Status change link in a saner place in the navigation. Fixes #1411 and #2433. Commit ready for merge. - Legacy-Id: 14497 --- ietf/group/templatetags/group_filters.py | 15 +++++++++++++++ ietf/templates/base/menu.html | 16 +++++++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/ietf/group/templatetags/group_filters.py b/ietf/group/templatetags/group_filters.py index 6dedb3911..d016b8378 100644 --- a/ietf/group/templatetags/group_filters.py +++ b/ietf/group/templatetags/group_filters.py @@ -1,5 +1,7 @@ from django import template +from ietf.group.models import Group + register = template.Library() @register.filter @@ -10,3 +12,16 @@ def has_sessions(group,num): def active_roles(queryset): return queryset.filter(group__state_id__in=['active', 'bof']).exclude(group__acronym='secretariat') +@register.filter +def active_nomcoms(user): + if not (user and hasattr(user, "is_authenticated") and user.is_authenticated): + return [] + + groups = [] + + groups.extend(Group.objects.filter( + role__person__user=user, + type_id='nomcom', + state__slug='active').distinct().select_related("type")) + + return groups diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html index 5cb4a9bf8..ed86c2acf 100644 --- a/ietf/templates/base/menu.html +++ b/ietf/templates/base/menu.html @@ -1,5 +1,5 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %} -{% load ietf_filters managed_groups wg_menu streams_menu active_groups_menu %} +{% load ietf_filters managed_groups wg_menu streams_menu active_groups_menu group_filters %} {% if flavor != "top" %} {% include "base/menu_user.html" %} @@ -52,6 +52,11 @@
  • Sign in to track docs
  • {% endif %} + {% if user|has_role:"Area Director,Secretariat" %} + {% if flavor == "top" %}{% endif %} +
  • RFC status changes
  • + {% endif %} + {% if user|has_role:"WG Chair,RG Chair" %} {% if flavor == "top" %}{% endif %}
  • WG chair
  • @@ -73,10 +78,15 @@ {% endfor %} {% endif %} - {% if user|has_role:"Area Director,Secretariat" %} + {% if user|active_nomcoms %} {% if flavor == "top" %}{% endif %} -
  • RFC status changes
  • +
  • Nomcoms
  • + {% for g in user|active_nomcoms %} +
  • {{ g.acronym|capfirst }}
  • + {% endfor %} {% endif %} + + {% if flavor == "top" %}{% endif %}
  • RFC streams
  • IAB