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

Let chairs know what to do after material submission uploads have been cut off. Fixes #2887.
 - Legacy-Id: 17507
Note: SVN reference [17487] has been migrated to Git commit ebdadf38f2
This commit is contained in:
Henrik Levkowetz 2020-03-22 18:13:11 +00:00
commit d2eedb4a94
3 changed files with 25 additions and 0 deletions

View file

@ -1093,6 +1093,24 @@ class SessionDetailsTests(TestCase):
r = self.client.get(url)
self.assertTrue(all([x in unicontent(r) for x in ('slides','agenda','minutes','draft')]))
self.assertNotContains(r, 'deleted')
def test_session_details_past_interim(self):
group = GroupFactory.create(type_id='wg',state_id='active')
chair = RoleFactory(name_id='chair',group=group)
session = SessionFactory.create(meeting__type_id='interim',group=group, meeting__date=datetime.date.today()-datetime.timedelta(days=90))
SessionPresentationFactory.create(session=session,document__type_id='draft',rev=None)
SessionPresentationFactory.create(session=session,document__type_id='minutes')
SessionPresentationFactory.create(session=session,document__type_id='slides')
SessionPresentationFactory.create(session=session,document__type_id='agenda')
url = urlreverse('ietf.meeting.views.session_details', kwargs=dict(num=session.meeting.number, acronym=group.acronym))
r = self.client.get(url)
self.assertEqual(r.status_code,200)
self.assertNotIn('The materials upload cutoff date for this session has passed', unicontent(r))
r = self.client.get(url)
self.assertEqual(r.status_code,200)
self.client.login(username=chair.person.user.username,password=chair.person.user.username+'+password')
self.assertTrue(all([x in unicontent(r) for x in ('slides','agenda','minutes','draft')]))
def test_add_session_drafts(self):
group = GroupFactory.create(type_id='wg',state_id='active')

View file

@ -1176,6 +1176,7 @@ def session_details(request, num, acronym):
'pending_suggestions' : pending_suggestions,
'meeting' :meeting ,
'acronym' :acronym,
'is_materials_manager' : session.group.has_role(request.user, session.group.features.matman_roles),
'can_manage_materials' : can_manage,
'thisweek': datetime.date.today()-datetime.timedelta(days=7),
})

View file

@ -21,6 +21,12 @@
{% endif %}
</h1>
{% if is_materials_manager and not can_manage_materials %}
<div class="alert alert-warning">
The materials upload cutoff date for this session has passed. If you need to change the materials, contact the Secretariat.
</div>
{% endif %}
{% with use_panels=unscheduled_sessions %}
{% if use_panels %}