From 301535932366654c543515d213d02447dbfb4b4a Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Wed, 31 May 2023 11:05:56 -0300 Subject: [PATCH 1/3] test: Use QuerySetAny alias for QuerySet type checks --- ietf/doc/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py index b2e65066a..6c9409475 100644 --- a/ietf/doc/utils.py +++ b/ietf/doc/utils.py @@ -17,7 +17,6 @@ from zoneinfo import ZoneInfo from django.conf import settings from django.contrib import messages -from django.db.models import QuerySet from django.forms import ValidationError from django.http import Http404 from django.template.loader import render_to_string @@ -25,6 +24,7 @@ from django.utils import timezone from django.utils.html import escape from django.urls import reverse as urlreverse +from django_stubs_ext import QuerySetAny import debug # pyflakes:ignore from ietf.community.models import CommunityList @@ -345,7 +345,7 @@ def augment_events_with_revision(doc, events): """Take a set of events for doc and add a .rev attribute with the revision they refer to by checking NewRevisionDocEvents.""" - if isinstance(events, QuerySet): + if isinstance(events, QuerySetAny): qs = events.filter(newrevisiondocevent__isnull=False) else: qs = NewRevisionDocEvent.objects.filter(doc=doc) @@ -353,7 +353,7 @@ def augment_events_with_revision(doc, events): if doc.type_id == "draft" and doc.get_state_slug() == "rfc": # add fake "RFC" revision - if isinstance(events, QuerySet): + if isinstance(events, QuerySetAny): e = events.filter(type="published_rfc").order_by('time').last() else: e = doc.latest_event(type="published_rfc") From e121b5dd5045a37068cdb7c493703f4d2a949849 Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Wed, 31 May 2023 12:36:21 -0300 Subject: [PATCH 2/3] fix: Return NomComs, not Groups, from active_nomcoms filter --- ietf/group/templatetags/group_filters.py | 17 ++++++++--------- ietf/templates/base/menu.html | 10 +++++----- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/ietf/group/templatetags/group_filters.py b/ietf/group/templatetags/group_filters.py index e7fb4a181..632567ca3 100644 --- a/ietf/group/templatetags/group_filters.py +++ b/ietf/group/templatetags/group_filters.py @@ -2,7 +2,7 @@ from django import template import debug # pyflakes:ignore -from ietf.group.models import Group +from ietf.nomcom.models import NomCom register = template.Library() @@ -19,14 +19,13 @@ 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 + return list( + NomCom.objects.filter( + group__role__person__user=user, + group__type_id='nomcom', # just in case... + group__state__slug='active', + ) + ) @register.inclusion_tag('person/person_link.html') def role_person_link(role, **kwargs): diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html index 691f1972d..d97980805 100644 --- a/ietf/templates/base/menu.html +++ b/ietf/templates/base/menu.html @@ -171,7 +171,7 @@ {% endfor %} {% endif %} - {% if user|active_nomcoms %} + {% with user|active_nomcoms as nomcoms %}{% if nomcoms %} {% if flavor == 'top' %}
    • @@ -179,15 +179,15 @@
  • NomComs
    • - {% for g in user|active_nomcoms %} + {% for nomcom in nomcoms %}
  • - {{ g.acronym|capfirst }} + href="{% url "ietf.nomcom.views.private_index" nomcom.year %}"> + {{ nomcom|capfirst }}
    • {% endfor %} - {% endif %} + {% endif %}{% endwith %} {% endif %} {% if flavor == 'top' %}
  • From 8cd09ab3be79b0942fdfe2b0e9075aba5828af4f Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Wed, 31 May 2023 14:13:46 -0300 Subject: [PATCH 3/3] Revert "fix: Return NomComs, not Groups, from active_nomcoms filter" This reverts commit e121b5dd5045a37068cdb7c493703f4d2a949849. --- ietf/group/templatetags/group_filters.py | 17 +++++++++-------- ietf/templates/base/menu.html | 10 +++++----- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ietf/group/templatetags/group_filters.py b/ietf/group/templatetags/group_filters.py index 632567ca3..e7fb4a181 100644 --- a/ietf/group/templatetags/group_filters.py +++ b/ietf/group/templatetags/group_filters.py @@ -2,7 +2,7 @@ from django import template import debug # pyflakes:ignore -from ietf.nomcom.models import NomCom +from ietf.group.models import Group register = template.Library() @@ -19,13 +19,14 @@ def active_nomcoms(user): if not (user and hasattr(user, "is_authenticated") and user.is_authenticated): return [] - return list( - NomCom.objects.filter( - group__role__person__user=user, - group__type_id='nomcom', # just in case... - group__state__slug='active', - ) - ) + groups = [] + + groups.extend(Group.objects.filter( + role__person__user=user, + type_id='nomcom', + state__slug='active').distinct().select_related("type")) + + return groups @register.inclusion_tag('person/person_link.html') def role_person_link(role, **kwargs): diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html index d97980805..691f1972d 100644 --- a/ietf/templates/base/menu.html +++ b/ietf/templates/base/menu.html @@ -171,7 +171,7 @@
    • {% endfor %} {% endif %} - {% with user|active_nomcoms as nomcoms %}{% if nomcoms %} + {% if user|active_nomcoms %} {% if flavor == 'top' %}
    • @@ -179,15 +179,15 @@
  • NomComs
    • - {% for nomcom in nomcoms %} + {% for g in user|active_nomcoms %}
  • - {{ nomcom|capfirst }} + href="{% url "ietf.nomcom.views.private_index" g.nomcom_set.first.year %}"> + {{ g.acronym|capfirst }}
    • {% endfor %} - {% endif %}{% endwith %} + {% endif %} {% endif %} {% if flavor == 'top' %}