Skip to content

Commit 26907e5

Browse files
committed
Merged in [17663] from rjsparks@nostrum.com:
Show recent meetings on a group's meeting tab even if there aren't other past meetings. Fixes ietf-tools#2961. - Legacy-Id: 17670 Note: SVN reference [17663] has been migrated to Git commit fec811d
2 parents 52a0164 + fec811d commit 26907e5

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

ietf/group/tests_info.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,7 @@ class MeetingInfoTests(TestCase):
13771377
def setUp(self):
13781378
self.group = GroupFactory.create(type_id='wg')
13791379
today = datetime.date.today()
1380-
SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=90))
1380+
SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=14))
13811381
self.inprog = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=1))
13821382
SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today+datetime.timedelta(days=90))
13831383
SessionFactory.create(meeting__type_id='interim',group=self.group,meeting__date=today+datetime.timedelta(days=45))
@@ -1391,6 +1391,9 @@ def test_meeting_info(self):
13911391
self.assertTrue(q('#inprogressmeets'))
13921392
self.assertTrue(q('#futuremeets'))
13931393
self.assertTrue(q('#pastmeets'))
1394+
# This should be improved to make sure each session shows up in the right section above
1395+
for session in self.group.session_set.all():
1396+
self.assertIn(session.meeting.number,unicontent(response))
13941397

13951398
self.group.session_set.filter(id=self.inprog.id).delete()
13961399
response = self.client.get(url)

ietf/templates/group/meetings.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</div>
4545
{% endif %}
4646

47-
{% if past %}
47+
{% if past or recent %}
4848
<div class="panel panel-default" id="pastmeets">
4949
<div class="panel-heading">
5050
Past Meetings

0 commit comments

Comments
 (0)