Skip to content

fix: Return NomComs, not Groups, from active_nomcoms filter #5726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 2 commits into from
May 31, 2023
Merged

fix: Return NomComs, not Groups, from active_nomcoms filter #5726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df55d85
fix: Return NomComs, not Groups, from active_nomcoms filter
jennifer-richards May 31, 2023
30e781c
fix: deduplicate and order nomcoms in active_nomcoms filter
jennifer-richards May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions ietf/group/templatetags/group_filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import debug # pyflakes:ignore

from ietf.group.models import Group
from ietf.nomcom.models import NomCom

register = template.Library()

Expand All @@ -19,14 +19,15 @@ 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',
)
Comment thread
rjsparks marked this conversation as resolved.
.distinct()
.order_by("group__acronym")
)

@register.inclusion_tag('person/person_link.html')
def role_person_link(role, **kwargs):
Expand Down
10 changes: 5 additions & 5 deletions ietf/templates/base/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,23 +171,23 @@
</li>
{% endfor %}
{% endif %}
{% if user|active_nomcoms %}
{% with user|active_nomcoms as nomcoms %}{% if nomcoms %}
{% if flavor == 'top' %}
<li><hr class="dropdown-divider">
</li>
{% endif %}
<li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>
NomComs
</li>
{% for g in user|active_nomcoms %}
{% for nomcom in nomcoms %}
<li>
<a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
href="{% url "ietf.nomcom.views.private_index" g.nomcom_set.first.year %}">
{{ g.acronym|capfirst }}
href="{% url "ietf.nomcom.views.private_index" nomcom.year %}">
{{ nomcom|capfirst }}
</a>
</li>
{% endfor %}
{% endif %}
{% endif %}{% endwith %}
{% endif %}
{% if flavor == 'top' %}
<li><hr class="dropdown-divider">
Expand Down