one more tweak before refactoring

 - Legacy-Id: 8455

Author: rjsparks

ietf/doc/views_material.py

@@ -196,7 +196,8 @@ def material_presentations(request, name, acronym=None, date=None, seq=None, wee
 
     # Find all the sessions for meetings that haven't ended that the user could affect
     # This motif is also in Document.future_presentations - it would be nice to consolodate it somehow
-    candidate_sessions = Session.objects.filter(meeting__date__gte=datetime.date.today()-datetime.timedelta(days=15))
+
+    candidate_sessions = Session.objects.exclude(status__in=['canceled','disappr','notmeet','deleted']).filter(meeting__date__gte=datetime.date.today()-datetime.timedelta(days=15))
     refined_candidates = [ sess for sess in candidate_sessions if sess.meeting.end_date()>=datetime.date.today()]
 
     if acronym:

ietf/meeting/models.py

@@ -838,10 +838,13 @@ def __unicode__(self):
         if self.meeting.type_id == "interim":
             return self.meeting.number
 
-        ss0name = "(unscheduled)"
-        ss = self.scheduledsession_set.filter(schedule=self.meeting.agenda).order_by('timeslot__time')
-        if ss:
-            ss0name = ','.join([x.timeslot.time.strftime("%a-%H%M") for x in ss])
+        if self.status.slug in ('canceled','disappr','notmeet','deleted'):
+            ss0name = "(%s)" % self.status.name
+        else:
+            ss0name = "(unscheduled)"
+            ss = self.scheduledsession_set.filter(schedule=self.meeting.agenda).order_by('timeslot__time')
+            if ss:
+                ss0name = ','.join([x.timeslot.time.strftime("%a-%H%M") for x in ss])
         return u"%s: %s %s %s" % (self.meeting, self.group.acronym, self.name, ss0name)
 
     def is_bof(self):