Skip to content

Commit c046739

Browse files
committed
allow Team Chairs access to proceedings. Commit ready for merge.
- Legacy-Id: 8155
1 parent 4db0adc commit c046739

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

ietf/ietfauth/utils.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,21 @@ def has_role(user, role_names, *args, **kwargs):
4141
return False
4242

4343
role_qs = {
44-
"Area Director": Q(person=person, name__in=("pre-ad", "ad"), group__type="area", group__state="active"),
45-
"Secretariat": Q(person=person, name="secr", group__acronym="secretariat"),
46-
"IANA": Q(person=person, name="auth", group__acronym="iana"),
44+
"Area Director": Q(person=person, name__in=("pre-ad", "ad"), group__type="area", group__state="active"),
45+
"Secretariat": Q(person=person, name="secr", group__acronym="secretariat"),
46+
"IANA": Q(person=person, name="auth", group__acronym="iana"),
4747
"RFC Editor": Q(person=person, name="auth", group__acronym="rfceditor"),
4848
"ISE" : Q(person=person, name="chair", group__acronym="ise"),
49-
"IAD": Q(person=person, name="admdir", group__acronym="ietf"),
50-
"IETF Chair": Q(person=person, name="chair", group__acronym="ietf"),
51-
"IRTF Chair": Q(person=person, name="chair", group__acronym="irtf"),
52-
"IAB Chair": Q(person=person, name="chair", group__acronym="iab"),
49+
"IAD": Q(person=person, name="admdir", group__acronym="ietf"),
50+
"IETF Chair": Q(person=person, name="chair", group__acronym="ietf"),
51+
"IRTF Chair": Q(person=person, name="chair", group__acronym="irtf"),
52+
"IAB Chair": Q(person=person, name="chair", group__acronym="iab"),
5353
"IAB Group Chair": Q(person=person, name="chair", group__type="iab", group__state="active"),
54-
"WG Chair": Q(person=person,name="chair", group__type="wg", group__state__in=["active","bof"]),
55-
"WG Secretary": Q(person=person,name="secr", group__type="wg", group__state__in=["active","bof"]),
56-
"RG Chair": Q(person=person,name="chair", group__type="rg", group__state="active"),
57-
"RG Secretary": Q(person=person,name="secr", group__type="rg", group__state="active"),
54+
"WG Chair": Q(person=person,name="chair", group__type="wg", group__state__in=["active","bof"]),
55+
"WG Secretary": Q(person=person,name="secr", group__type="wg", group__state__in=["active","bof"]),
56+
"RG Chair": Q(person=person,name="chair", group__type="rg", group__state="active"),
57+
"RG Secretary": Q(person=person,name="secr", group__type="rg", group__state="active"),
58+
"Team Chair": Q(person=person,name="chair", group__type="team", group__state="active"),
5859
"Nomcom Chair": Q(person=person, name="chair", group__type="nomcom", group__state="active", group__acronym__icontains=kwargs.get('year', '0000')),
5960
"Nomcom Advisor": Q(person=person, name="advisor", group__type="nomcom", group__state="active", group__acronym__icontains=kwargs.get('year', '0000')),
6061
"Nomcom": Q(person=person, group__type="nomcom", group__state="active", group__acronym__icontains=kwargs.get('year', '0000')),

ietf/secr/middleware/secauth.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
from ietf.ietfauth.utils import has_role, role_required
66

77

8-
98
class SecAuthMiddleware(object):
109
"""
1110
Middleware component that performs custom auth check for secretariat
@@ -46,7 +45,7 @@ def process_view(self, request, view_func, view_args, view_kwargs):
4645
return login_required(view_func)(request,*view_args,**view_kwargs)
4746
elif self.is_unrestricted_url(request.path):
4847
return role_required('WG Chair','WG Secretary','RG Chair','IAB Group Chair',
49-
'Area Director','Secretariat')(view_func)(request,*view_args,**view_kwargs)
48+
'Area Director','Secretariat','Team Chair')(view_func)(request,*view_args,**view_kwargs)
5049
else:
5150
return role_required('Secretariat')(view_func)(request,*view_args,**view_kwargs)
5251
else:

0 commit comments

Comments
 (0)