Distinguish group that have session requests from those that do not on the materials/editable-groups page. Fixes #2284. Commit ready for merge.

- Legacy-Id: 13246
This commit is contained in:
Robert Sparks 2017-04-19 18:04:48 +00:00
parent 0088273f5a
commit 2e54a5c443
4 changed files with 17 additions and 3 deletions

View file

View file

@ -0,0 +1,8 @@
from django import template
register = template.Library()
@register.filter
def has_sessions(group,num):
return group.session_set.filter(meeting__number=num).exists()

View file

@ -297,12 +297,14 @@ class MeetingTests(TestCase):
self.assertEqual(r.status_code, 200)
self.assertTrue(meeting.number in unicontent(r))
self.assertTrue("mars" in unicontent(r))
self.assertFalse("No session requested" in unicontent(r))
self.client.login(username="ad", password="ad+password")
r = self.client.get(urlreverse("ietf.meeting.views.materials_editable_groups", kwargs={'num':meeting.number}))
self.assertEqual(r.status_code, 200)
self.assertTrue(meeting.number in unicontent(r))
self.assertTrue("frfarea" in unicontent(r))
self.assertTrue("No session requested" in unicontent(r))
self.client.login(username="plain",password="plain+password")
r = self.client.get(urlreverse("ietf.meeting.views.materials_editable_groups", kwargs={'num':meeting.number}))

View file

@ -2,16 +2,20 @@
{# Copyright The IETF Trust 2016, All Rights Reserved #}
{% load origin %}
{% load ietf_filters managed_groups %}
{% load ietf_filters managed_groups group_tags %}
{% block content %}
<h1>IETF {{ meeting_num }} meeting materials that you can edit</h1>
{% if user and user.is_authenticated and user|managed_groups %}
{% for g in user|managed_groups %}
<p><a href="{% url 'ietf.meeting.views.session_details' num=meeting_num acronym=g.acronym %}">{{ g.acronym }}</a></p>
{% if g|has_sessions:meeting_num %}
<p><a href="{% url 'ietf.meeting.views.session_details' num=meeting_num acronym=g.acronym %}">{{ g.acronym }}</a></p>
{% else %}
<p>{{ g.acronym }} (No session requested) </p>
{% endif %}
{% endfor %}
{% else %}
<p>You cannot manage the meeting materials for any groups.</p>
{% endif %}
{% endblock %}
{% endblock %}