Skip to content

Commit 8737808

Browse files
committed
Fixes Ticket ietf-tools#1791. Secretariat locked out of Session Request Tool. Commit ready for merge
- Legacy-Id: 10339
1 parent 67e1678 commit 8737808

2 files changed

Lines changed: 14 additions & 3 deletions

File tree

ietf/secr/sreq/tests.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,20 @@ def test_new_request(self):
9393
meeting.save()
9494
group = Group.objects.get(acronym='mars')
9595
url = reverse('sessions_new',kwargs={'acronym':group.acronym})
96+
97+
# try as WG Chair
98+
self.client.login(username="marschairman", password="marschairman+password")
99+
r = self.client.get(url,follow=True)
100+
self.assertEqual(r.status_code, 200)
101+
q = PyQuery(r.content)
102+
self.assertEqual(len(q('#session-request-form')),0)
103+
104+
# try as Secretariat
96105
self.client.login(username="secretary", password="secretary+password")
97-
r = self.client.get(url)
98-
self.assertEqual(r.status_code, 302)
106+
r = self.client.get(url,follow=True)
107+
self.assertEqual(r.status_code, 200)
108+
q = PyQuery(r.content)
109+
self.assertEqual(len(q('#session-request-form')),1)
99110

100111
class EditRequestCase(TestCase):
101112
pass

ietf/secr/sreq/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ def new(request, acronym):
543543

544544
# check if app is locked
545545
is_locked = check_app_locked()
546-
if is_locked:
546+
if is_locked and not has_role(request.user,'Secretariat'):
547547
messages.warning(request, "The Session Request Tool is closed")
548548
return redirect('sessions')
549549

0 commit comments

Comments
 (0)