From 096bd5e83e00aca2c0c6d8e07c41783f0e4c4da3 Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Mon, 2 Mar 2015 23:40:17 +0000 Subject: [PATCH] Add AG Secretary to Proceedings authorized roles. Commit ready to merge. - Legacy-Id: 9143 --- ietf/ietfauth/utils.py | 23 ++++++++++++----------- ietf/secr/proceedings/views.py | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ietf/ietfauth/utils.py b/ietf/ietfauth/utils.py index e957e65bf..08e9fa02d 100644 --- a/ietf/ietfauth/utils.py +++ b/ietf/ietfauth/utils.py @@ -44,20 +44,21 @@ def has_role(user, role_names, *args, **kwargs): return False role_qs = { - "Area Director": Q(person=person, name__in=("pre-ad", "ad"), group__type="area", group__state="active"), - "Secretariat": Q(person=person, name="secr", group__acronym="secretariat"), - "IANA": Q(person=person, name="auth", group__acronym="iana"), + "Area Director": Q(person=person, name__in=("pre-ad", "ad"), group__type="area", group__state="active"), + "Secretariat": Q(person=person, name="secr", group__acronym="secretariat"), + "IANA": Q(person=person, name="auth", group__acronym="iana"), "RFC Editor": Q(person=person, name="auth", group__acronym="rfceditor"), "ISE" : Q(person=person, name="chair", group__acronym="ise"), - "IAD": Q(person=person, name="admdir", group__acronym="ietf"), - "IETF Chair": Q(person=person, name="chair", group__acronym="ietf"), - "IRTF Chair": Q(person=person, name="chair", group__acronym="irtf"), - "IAB Chair": Q(person=person, name="chair", group__acronym="iab"), + "IAD": Q(person=person, name="admdir", group__acronym="ietf"), + "IETF Chair": Q(person=person, name="chair", group__acronym="ietf"), + "IRTF Chair": Q(person=person, name="chair", group__acronym="irtf"), + "IAB Chair": Q(person=person, name="chair", group__acronym="iab"), "IAB Group Chair": Q(person=person, name="chair", group__type="iab", group__state="active"), - "WG Chair": Q(person=person,name="chair", group__type="wg", group__state__in=["active","bof", "proposed"]), - "WG Secretary": Q(person=person,name="secr", group__type="wg", group__state__in=["active","bof", "proposed"]), - "RG Chair": Q(person=person,name="chair", group__type="rg", group__state__in=["active","proposed"]), - "RG Secretary": Q(person=person,name="secr", group__type="rg", group__state__in=["active","proposed"]), + "WG Chair": Q(person=person,name="chair", group__type="wg", group__state__in=["active","bof", "proposed"]), + "WG Secretary": Q(person=person,name="secr", group__type="wg", group__state__in=["active","bof", "proposed"]), + "RG Chair": Q(person=person,name="chair", group__type="rg", group__state__in=["active","proposed"]), + "RG Secretary": Q(person=person,name="secr", group__type="rg", group__state__in=["active","proposed"]), + "AG Secretary": Q(person=person,name="secr", group__type="ag", group__state__in=["active"]), "Team Chair": Q(person=person,name="chair", group__type="team", group__state="active"), "Nomcom Chair": Q(person=person, name="chair", group__type="nomcom", group__state="active", group__acronym__icontains=kwargs.get('year', '0000')), "Nomcom Advisor": Q(person=person, name="advisor", group__type="nomcom", group__state="active", group__acronym__icontains=kwargs.get('year', '0000')), diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py index b05753904..cb45f6d55 100644 --- a/ietf/secr/proceedings/views.py +++ b/ietf/secr/proceedings/views.py @@ -35,7 +35,7 @@ from ietf.secr.proceedings.proc_utils import ( gen_acknowledgement, gen_agenda, # ------------------------------------------------- # Globals # ------------------------------------------------- -AUTHORIZED_ROLES=('WG Chair','WG Secretary','RG Chair','IRTF Chair','IAB Group Chair','Area Director','Secretariat','Team Chair') +AUTHORIZED_ROLES=('WG Chair','WG Secretary','RG Chair','AG Secretary','IRTF Chair','IAB Group Chair','Area Director','Secretariat','Team Chair') # ------------------------------------------------- # Helper Functions # -------------------------------------------------