From 8cd09ab3be79b0942fdfe2b0e9075aba5828af4f Mon Sep 17 00:00:00 2001
From: Jennifer Richards <jennifer@staff.ietf.org>
Date: Wed, 31 May 2023 14:13:46 -0300
Subject: [PATCH] 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 @@
                 </li>
             {% endfor %}
         {% endif %}
-        {% with user|active_nomcoms as nomcoms %}{% if nomcoms %}
+        {% if user|active_nomcoms %}
             {% if flavor == 'top' %}
                 <li><hr class="dropdown-divider">
                 </li>
@@ -179,15 +179,15 @@
             <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>
             	NomComs
             </li>
-            {% for nomcom in nomcoms %}
+            {% for g in user|active_nomcoms %}
                 <li>
                     <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
-                       href="{% url "ietf.nomcom.views.private_index" nomcom.year %}">
-                        {{ nomcom|capfirst }}
+                       href="{% url "ietf.nomcom.views.private_index" g.nomcom_set.first.year %}">
+                        {{ g.acronym|capfirst }}
                     </a>
                 </li>
             {% endfor %}
-        {% endif %}{% endwith %}
+        {% endif %}
     {% endif %}
     {% if flavor == 'top' %}
         <li><hr class="dropdown-divider">