Merged in [10339] from rcross@amsl.com:

Fixes Ticket #1791.  Secretariat locked out of Session Request Tool.
 - Legacy-Id: 10351
Note: SVN reference [10339] has been migrated to Git commit 8737808e4b

ietf/secr/sreq/tests.py

@@ -93,9 +93,20 @@ class LockAppTestCase(TestCase):
         meeting.save()
         group = Group.objects.get(acronym='mars')
         url = reverse('sessions_new',kwargs={'acronym':group.acronym})
+        
+        # try as WG Chair
+        self.client.login(username="marschairman", password="marschairman+password")
+        r = self.client.get(url,follow=True)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q('#session-request-form')),0)
+        
+        # try as Secretariat
         self.client.login(username="secretary", password="secretary+password")
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 302)
+        r = self.client.get(url,follow=True)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q('#session-request-form')),1)
         
 class EditRequestCase(TestCase):
     pass

ietf/secr/sreq/views.py

@@ -543,7 +543,7 @@ def new(request, acronym):
 
     # check if app is locked
     is_locked = check_app_locked()
-    if is_locked:
+    if is_locked and not has_role(request.user,'Secretariat'):
         messages.warning(request, "The Session Request Tool is closed")
         return redirect('sessions')