From f1425e4a52ec31a164d7a2f616468df0fa340c08 Mon Sep 17 00:00:00 2001 From: Peter Yee Date: Mon, 6 Nov 2023 17:45:07 +0100 Subject: [PATCH] fix: move meeting management from base Docs to Meeting (#6586) * fix: move meeting management from base Docs to Meeting * fix: add permission check for ability to request an interim meeting * fix: guard against no user being logged in --------- Co-authored-by: Robert Sparks --- ietf/meeting/templatetags/meetings_filters.py | 21 ++++++++++++ ietf/templates/base/menu.html | 32 +++++++++++++------ 2 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 ietf/meeting/templatetags/meetings_filters.py diff --git a/ietf/meeting/templatetags/meetings_filters.py b/ietf/meeting/templatetags/meetings_filters.py new file mode 100644 index 000000000..3fa209daa --- /dev/null +++ b/ietf/meeting/templatetags/meetings_filters.py @@ -0,0 +1,21 @@ +# Copyright The IETF Trust 2023, All Rights Reserved +# -*- coding: utf-8 -*- + +from django import template +from ietf.meeting.helpers import can_request_interim_meeting + +import debug # pyflakes:ignore + +register = template.Library() + +@register.filter +def can_request_interim(user): + """Determine whether the user can request an interim meeting + + Usage: can_request_interim + Returns Boolean. True means user can request an interim meeting. + """ + + if not user: + return False + return can_request_interim_meeting(user) diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html index 693a33bd8..8d70fd481 100644 --- a/ietf/templates/base/menu.html +++ b/ietf/templates/base/menu.html @@ -1,7 +1,7 @@ {# Copyright The IETF Trust 2015-2022, All Rights Reserved #} {% load origin %} {% origin %} -{% load ietf_filters managed_groups wg_menu active_groups_menu group_filters cache %} +{% load ietf_filters managed_groups wg_menu active_groups_menu group_filters cache meetings_filters %} {% if flavor != 'top' %} {% include "base/menu_user.html" %} {% endif %} @@ -144,14 +144,6 @@ {% endfor %} - {% for g in user|matman_groups %} -
  • - - {{ g.acronym }} {{ g.type.slug }} meetings - -
  • - {% endfor %} {% endif %} {% if user|has_role:"Review Team Secretary" %} {% if flavor == 'top' %} @@ -275,12 +267,32 @@ Request a session + {% if user|can_request_interim %} +
  • + + Request an interim meeting + +
  • + {% endif %}
  • Session requests
  • + {% if user|matman_groups %} + {% if flavor == 'top' %}
  • {% endif %} +
  • Manage
  • + {% for g in user|matman_groups %} +
  • + + {{ g.acronym }} {{ g.type.slug }} meetings + +
  • + {% endfor %} + {% endif %} {% if flavor == 'top' %} {% if flavor == 'top' %}
  • @@ -425,4 +437,4 @@ {% endif %} {% if flavor == 'top' %} {% include "base/menu_user.html" %} -{% endif %} \ No newline at end of file +{% endif %}