altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged [7568] from rcross@amsl.com: grant ISOC CEO access to announcement tool, change announcement tool from option 'IAB Executive Director' to 'IAB Executive Administrative Manager'

Browse source 
- Legacy-Id: 7573
Note: SVN reference [7568] has been migrated to Git commit 2cf5f1ce25
This commit is contained in:
Henrik Levkowetz 2014-04-06 15:09:55 +00:00
parent b8cd069070 2cf5f1ce25
commit 7603f4e1da
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ietf/secr/announcement/forms.py
View file

@ -32,8 +32,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>',
@ -109,6 +110,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",

11
ietf/secr/announcement/views.py
View file

@ -14,9 +14,10 @@ from ietf.utils.mail import send_mail_text
# -------------------------------------------------
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")
@ -34,6 +35,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