From 2cf5f1ce25835f7a88666cc190d1e9cc47030321 Mon Sep 17 00:00:00 2001
From: Ryan Cross <rcross@amsl.com>
Date: Thu, 3 Apr 2014 17:46:27 +0000
Subject: [PATCH] grant ISOC CEO access to announcement tool, change
announcement tool from option 'IAB Executive Director' to 'IAB Executive
Administrative Manager' - Legacy-Id: 7568
---
ietf/secr/announcement/forms.py | 9 +++++++--
ietf/secr/announcement/views.py | 11 ++++++++---
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ietf/secr/announcement/forms.py b/ietf/secr/announcement/forms.py
index ae37f31d7..f8f1e0959 100644
--- a/ietf/secr/announcement/forms.py
+++ b/ietf/secr/announcement/forms.py
@@ -34,8 +34,9 @@ FROM_LIST = ('IETF Secretariat <ietf-secretariat@ietf.org>',
'RSOC Chair <rsoc-chair@iab.org>',
'ISOC Board of Trustees <eburger@standardstrack.com>',
'RFC Series Editor <rse@rfc-editor.org>',
- 'IAB Executive Director <execd@iab.org>',
- 'IETF Mentoring Program <mentoring@ietf.org>')
+ 'IAB Executive Administrative Manager <execd@iab.org>',
+ 'IETF Mentoring Program <mentoring@ietf.org>',
+ 'ISOC CEO <ceo@isoc.org>')
TO_LIST = ('IETF Announcement List <ietf-announce@ietf.org>',
'I-D Announcement List <i-d-announce@ietf.org>',
@@ -111,6 +112,10 @@ def get_from_choices(user):
group__acronym='mentor',
name="chair"):
f = (FROM_LIST[17],)
+ elif Role.objects.filter(person=person,
+ group__acronym='isoc',
+ name="ceo"):
+ f = (FROM_LIST[18],)
# NomCom
nomcoms = Role.objects.filter(name="chair",
diff --git a/ietf/secr/announcement/views.py b/ietf/secr/announcement/views.py
index ed37f5e59..d310d6331 100644
--- a/ietf/secr/announcement/views.py
+++ b/ietf/secr/announcement/views.py
@@ -17,9 +17,10 @@ from forms import *
# -------------------------------------------------
def check_access(user):
'''
- This function takes a Django User object and returns true if the user has access to the
- Announcement app. Accepted roles are:
- Secretariat, IAD, IAB Chair, IETF Chair, RSOC Chair, IAOC Chair, NomCom Chair, RSE Chair
+ This function takes a Django User object and returns true if the user has access to
+ the Announcement app. Accepted roles are:
+ Secretariat, IAD, IAB Chair, IETF Chair, RSOC Chair, IAOC Chair, NomCom Chair,
+ RSE Chair, ISOC CEO
'''
person = user.person
groups_with_access = ("iab", "rsoc", "ietf", "iaoc", "rse", "mentor")
@@ -37,6 +38,10 @@ def check_access(user):
group__acronym='iab',
name='execdir'):
return True
+ if Role.objects.filter(person=person,
+ group__acronym='isoc',
+ name='ceo'):
+ return True
return False