Merged in [17418] from rjsparks@nostrum.com:

Correctly represent cancelled sessions in ics files. Fixes #2905.
 - Legacy-Id: 17421
Note: SVN reference [17418] has been migrated to Git commit 51327d0767

ietf/meeting/tests_views.py

@@ -607,6 +607,14 @@ class MeetingTests(TestCase):
         self.assertEqual(response.status_code,200)
         self.assertEqual(response.get('Content-Type'), 'text/calendar')
 
+    def test_cancelled_ics(self):
+        session=SessionFactory(meeting__type_id='ietf',status_id='canceled')
+        url = urlreverse('ietf.meeting.views.ical_agenda', kwargs=dict(num=session.meeting.number))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code,200)
+        self.assertIn('STATUS:CANCELLED',unicontent(r))
+        self.assertNotIn('STATUS:CONFIRMED',unicontent(r))
+
 class ReorderSlidesTests(TestCase):
 
     def test_add_slides_to_session(self):

ietf/meeting/views.py

@@ -952,7 +952,7 @@ def ical_agenda(request, num=None, name=None, acronym=None, session_id=None):
 
     for a in assignments:
         if a.session:
-            a.session.ical_status = ical_session_status(a.session)
+            a.session.ical_status = ical_session_status(a.session.current_status)
 
     return render(request, "meeting/agenda.ics", {
         "schedule": schedule,