From fec811de36460feda474c85d2d0bfd51997a573d Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Mon, 20 Apr 2020 17:31:28 +0000 Subject: [PATCH] Show recent meetings on a group's meeting tab even if there aren't other past meetings. Fixes #2961. Commit ready for merge. - Legacy-Id: 17663 --- ietf/group/tests_info.py | 5 ++++- ietf/templates/group/meetings.html | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py index 42f395747..478451e2c 100644 --- a/ietf/group/tests_info.py +++ b/ietf/group/tests_info.py @@ -1377,7 +1377,7 @@ class MeetingInfoTests(TestCase): def setUp(self): self.group = GroupFactory.create(type_id='wg') today = datetime.date.today() - SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=90)) + SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=14)) self.inprog = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=1)) SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today+datetime.timedelta(days=90)) SessionFactory.create(meeting__type_id='interim',group=self.group,meeting__date=today+datetime.timedelta(days=45)) @@ -1391,6 +1391,9 @@ class MeetingInfoTests(TestCase): self.assertTrue(q('#inprogressmeets')) self.assertTrue(q('#futuremeets')) self.assertTrue(q('#pastmeets')) + # This should be improved to make sure each session shows up in the right section above + for session in self.group.session_set.all(): + self.assertIn(session.meeting.number,unicontent(response)) self.group.session_set.filter(id=self.inprog.id).delete() response = self.client.get(url) diff --git a/ietf/templates/group/meetings.html b/ietf/templates/group/meetings.html index 8c8d24ded..9639fc614 100644 --- a/ietf/templates/group/meetings.html +++ b/ietf/templates/group/meetings.html @@ -44,7 +44,7 @@ {% endif %} -{% if past %} +{% if past or recent %}
Past Meetings