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

Look at all scheduled sessions for a group when deciding to display a cancelled banner. Fixes #2764.
 - Legacy-Id: 16691
Note: SVN reference [16604] has been migrated to Git commit aea3c1a55b1b14f9da90d0cfb03891e7129f8632

bin/mergeready

@@ -288,6 +288,7 @@ hold  += get_changeset_list_from_file(repo, '../hold-for-merge')
 ready += get_ready_commits(repo, 'personal')
 ready += get_ready_commits(repo, 'branch/amsl')
 ready += get_ready_commits(repo, 'branch/iola')
+ready += get_ready_commits(repo, 'branch/dash')
 ready += get_ready_commits(repo, 'branch/proceedings')
 
 ready_commits = {}

ietf/meeting/models.py

@@ -968,6 +968,10 @@ class Session(models.Model):
         else:
             return [self]
 
+    def all_meeting_sessions_cancelled(self):
+        states = set([s.status_id for s in self.all_meeting_sessions_for_group()])
+        return 'canceled' in states and len(states) == 1
+
     def all_meeting_recordings(self):
         recordings = [] # These are not sets because we need to preserve relative ordering or redo the ordering work later
         sessions = self.all_meeting_sessions_for_group()

ietf/templates/meeting/group_materials.html

@@ -18,7 +18,7 @@
     {% endif %}
   </td>
 
-  {% if session.status_id == 'canceled' %}
+  {% if session.all_meeting_sessions_cancelled %}
     {% if user|has_role:"Secretariat" or user_groups %}
       <td colspan="6"><span class="label label-danger">Session cancelled</span></td>
     {% else %}

ietf/templates/meeting/group_proceedings.html

@@ -18,7 +18,7 @@
     {% endif %}
   </td>
 
-  {% if session.status_id == 'canceled' %}
+  {% if session.all_meeting_sessions_cancelled %}
     <td colspan="3"><span class="label label-danger">Session cancelled</span></td>
   {% else %}
     <td>