Clearly label cancelled sessions on the week-view on the agenda page. Fixes #2619. Commit ready for merge.

- Legacy-Id: 15694

ietf/doc/admin.py

@@ -1,5 +1,3 @@
-from django.utils.text import slugify
-from django.utils.safestring import mark_safe
 from django.contrib import admin
 from django import forms
 
@@ -10,8 +8,6 @@ from models import (StateType, State, RelatedDocument, DocumentAuthor, Document,
     AddedMessageEvent, SubmissionDocEvent, DeletedEvent, EditedAuthorsDocEvent, DocumentURL)
 
 
-from ietf.doc.utils import get_state_types
-
 class StateTypeAdmin(admin.ModelAdmin):
     list_display = ["slug", "label"]
 admin.site.register(StateType, StateTypeAdmin)

ietf/meeting/tests_views.py

@@ -181,10 +181,21 @@ class MeetingTests(TestCase):
         # week view
         r = self.client.get(urlreverse("ietf.meeting.views.week_view", kwargs=dict(num=meeting.number)))
         self.assertEqual(r.status_code, 200)
-        agenda_content = r.content
+        agenda_content = unicontent(r)
+        self.assertNotIn('CANCELLED',agenda_content)
         self.assertTrue(session.group.acronym in agenda_content)
         self.assertTrue(slot.location.name in agenda_content)
 
+        # week view with a cancelled session
+        session.status_id='canceled'
+        session.save()
+        r = self.client.get(urlreverse("ietf.meeting.views.week_view", kwargs=dict(num=meeting.number)))
+        self.assertEqual(r.status_code, 200)
+        agenda_content = unicontent(r)
+        self.assertIn('CANCELLED',agenda_content)
+        self.assertTrue(session.group.acronym in agenda_content)
+        self.assertTrue(slot.location.name in agenda_content)       
+
     def test_agenda_current_audio(self):
         date = datetime.date.today()
         meeting = MeetingFactory(type_id='ietf', date=date )

ietf/meeting/views.py

@@ -790,6 +790,9 @@ def week_view(request, num=None, name=None, owner=None):
             if a.session and a.session.agenda():
                 item["agenda"] = a.session.agenda().href()
 
+            if a.session.status_id=='canceled':
+                item["name"] = "CANCELLED - " + item["name"]
+
         items.append(item)
 
     return render(request, "meeting/week-view.html", {