altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

fix: move meeting management from base Docs to Meeting (#6586)

Browse source 
* 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 <rjsparks@nostrum.com>
This commit is contained in:
Peter Yee 2023-11-06 17:45:07 +01:00 committed by GitHub
parent f8a06f663e
commit f1425e4a52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ietf/meeting/templatetags/meetings_filters.py Normal file
View file

@ -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)

30
ietf/templates/base/menu.html
View file

@ -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 @@
</a>
</li>
{% endfor %}
{% for g in user|matman_groups %}
<li>
<a class="dropdown-item {% if flavor != 'top' %}text-wrap{% endif %}"
href="{% url "ietf.group.views.meetings" g.acronym %}">
{{ g.acronym }} {{ g.type.slug }} meetings
</a>
</li>
{% endfor %}
{% endif %}
{% if user|has_role:"Review Team Secretary" %}
{% if flavor == 'top' %}
@ -275,12 +267,32 @@
Request a session
</a>
</li>
{% if user|can_request_interim %}
<li>
<a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
href="{% url 'ietf.meeting.views.interim_request' %}">
Request an interim meeting
</a>
</li>
{% endif %}
<li>
<a class="dropdown-item {% if flavor != 'top' %}text-wrap{% endif %}"
href="{% url 'ietf.meeting.views.meeting_requests' %}">
Session requests
</a>
</li>
{% if user|matman_groups %}
{% if flavor == 'top' %}<li><hr class="dropdown-divider"></li>{% endif %}
<li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>Manage</li>
{% for g in user|matman_groups %}
<li>
<a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
href="{% url "ietf.group.views.meetings" g.acronym %}">
{{ g.acronym }} {{ g.type.slug }} meetings
</a>
</li>
{% endfor %}
{% endif %}
{% if flavor == 'top' %}
{% if flavor == 'top' %}
<li><hr class="dropdown-divider">