diff --git a/bin/mergeready b/bin/mergeready index fc2c89c2e..79f383e35 100755 --- a/bin/mergeready +++ b/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 = {} diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index ca6ed263b..5e733c51e 100644 --- a/ietf/meeting/models.py +++ b/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() diff --git a/ietf/templates/meeting/group_materials.html b/ietf/templates/meeting/group_materials.html index 67c0e6f1b..c80660282 100644 --- a/ietf/templates/meeting/group_materials.html +++ b/ietf/templates/meeting/group_materials.html @@ -18,7 +18,7 @@ {% endif %} - {% if session.status_id == 'canceled' %} + {% if session.all_meeting_sessions_cancelled %} {% if user|has_role:"Secretariat" or user_groups %}