Skip to content

Commit 2e54a5c

Browse files
committed
Distinguish group that have session requests from those that do not on the materials/editable-groups page. Fixes ietf-tools#2284. Commit ready for merge.
- Legacy-Id: 13246
1 parent 0088273 commit 2e54a5c

4 files changed

Lines changed: 17 additions & 3 deletions

File tree

ietf/group/templatetags/__init__.py

Whitespace-only changes.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
from django import template
2+
3+
register = template.Library()
4+
5+
@register.filter
6+
def has_sessions(group,num):
7+
return group.session_set.filter(meeting__number=num).exists()
8+

ietf/meeting/tests_views.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,12 +297,14 @@ def test_materials_editable_groups(self):
297297
self.assertEqual(r.status_code, 200)
298298
self.assertTrue(meeting.number in unicontent(r))
299299
self.assertTrue("mars" in unicontent(r))
300+
self.assertFalse("No session requested" in unicontent(r))
300301

301302
self.client.login(username="ad", password="ad+password")
302303
r = self.client.get(urlreverse("ietf.meeting.views.materials_editable_groups", kwargs={'num':meeting.number}))
303304
self.assertEqual(r.status_code, 200)
304305
self.assertTrue(meeting.number in unicontent(r))
305306
self.assertTrue("frfarea" in unicontent(r))
307+
self.assertTrue("No session requested" in unicontent(r))
306308

307309
self.client.login(username="plain",password="plain+password")
308310
r = self.client.get(urlreverse("ietf.meeting.views.materials_editable_groups", kwargs={'num':meeting.number}))

ietf/templates/meeting/materials_editable_groups.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@
22
{# Copyright The IETF Trust 2016, All Rights Reserved #}
33
{% load origin %}
44

5-
{% load ietf_filters managed_groups %}
5+
{% load ietf_filters managed_groups group_tags %}
66

77
{% block content %}
88
<h1>IETF {{ meeting_num }} meeting materials that you can edit</h1>
99

1010
{% if user and user.is_authenticated and user|managed_groups %}
1111
{% for g in user|managed_groups %}
12-
<p><a href="{% url 'ietf.meeting.views.session_details' num=meeting_num acronym=g.acronym %}">{{ g.acronym }}</a></p>
12+
{% if g|has_sessions:meeting_num %}
13+
<p><a href="{% url 'ietf.meeting.views.session_details' num=meeting_num acronym=g.acronym %}">{{ g.acronym }}</a></p>
14+
{% else %}
15+
<p>{{ g.acronym }} (No session requested) </p>
16+
{% endif %}
1317
{% endfor %}
1418
{% else %}
1519
<p>You cannot manage the meeting materials for any groups.</p>
1620
{% endif %}
17-
{% endblock %}
21+
{% endblock %}

0 commit comments

Comments
 (0)