Skip to content

Commit d2eedb4

Browse files
committed
Merged in [17487] from rjsparks@nostrum.com:
Let chairs know what to do after material submission uploads have been cut off. Fixes ietf-tools#2887. - Legacy-Id: 17507 Note: SVN reference [17487] has been migrated to Git commit ebdadf3
2 parents ff7571f + ebdadf3 commit d2eedb4

3 files changed

Lines changed: 25 additions & 0 deletions

File tree

ietf/meeting/tests_views.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,24 @@ def test_session_details(self):
10931093
r = self.client.get(url)
10941094
self.assertTrue(all([x in unicontent(r) for x in ('slides','agenda','minutes','draft')]))
10951095
self.assertNotContains(r, 'deleted')
1096+
1097+
def test_session_details_past_interim(self):
1098+
group = GroupFactory.create(type_id='wg',state_id='active')
1099+
chair = RoleFactory(name_id='chair',group=group)
1100+
session = SessionFactory.create(meeting__type_id='interim',group=group, meeting__date=datetime.date.today()-datetime.timedelta(days=90))
1101+
SessionPresentationFactory.create(session=session,document__type_id='draft',rev=None)
1102+
SessionPresentationFactory.create(session=session,document__type_id='minutes')
1103+
SessionPresentationFactory.create(session=session,document__type_id='slides')
1104+
SessionPresentationFactory.create(session=session,document__type_id='agenda')
1105+
1106+
url = urlreverse('ietf.meeting.views.session_details', kwargs=dict(num=session.meeting.number, acronym=group.acronym))
1107+
r = self.client.get(url)
1108+
self.assertEqual(r.status_code,200)
1109+
self.assertNotIn('The materials upload cutoff date for this session has passed', unicontent(r))
1110+
r = self.client.get(url)
1111+
self.assertEqual(r.status_code,200)
1112+
self.client.login(username=chair.person.user.username,password=chair.person.user.username+'+password')
1113+
self.assertTrue(all([x in unicontent(r) for x in ('slides','agenda','minutes','draft')]))
10961114

10971115
def test_add_session_drafts(self):
10981116
group = GroupFactory.create(type_id='wg',state_id='active')

ietf/meeting/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,6 +1176,7 @@ def session_details(request, num, acronym):
11761176
'pending_suggestions' : pending_suggestions,
11771177
'meeting' :meeting ,
11781178
'acronym' :acronym,
1179+
'is_materials_manager' : session.group.has_role(request.user, session.group.features.matman_roles),
11791180
'can_manage_materials' : can_manage,
11801181
'thisweek': datetime.date.today()-datetime.timedelta(days=7),
11811182
})

ietf/templates/meeting/session_details.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ <h1>{{ meeting }} : {{ acronym }}
2121
{% endif %}
2222
</h1>
2323

24+
{% if is_materials_manager and not can_manage_materials %}
25+
<div class="alert alert-warning">
26+
The materials upload cutoff date for this session has passed. If you need to change the materials, contact the Secretariat.
27+
</div>
28+
{% endif %}
29+
2430

2531
{% with use_panels=unscheduled_sessions %}
2632
{% if use_panels %}

0 commit comments

Comments
 (0)