From d6422c0c93f7b98b0ba52be65d45b77e73e867c0 Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Thu, 3 Jul 2014 19:35:38 +0000 Subject: [PATCH] grant IETF Trust Chair permissions for Announcement Tool. commit ready for merge. - Legacy-Id: 8045 --- ietf/secr/announcement/forms.py | 6 +++++- ietf/secr/announcement/views.py | 6 ++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ietf/secr/announcement/forms.py b/ietf/secr/announcement/forms.py index 1bbb0f2d0..95c499efb 100644 --- a/ietf/secr/announcement/forms.py +++ b/ietf/secr/announcement/forms.py @@ -28,7 +28,7 @@ FROM_LIST = ('IETF Secretariat ', 'IETF Administrative Director ', 'IETF Executive Director ', 'The IAOC ', - 'The IETF Trust ', + 'The IETF Trust ', 'RSOC Chair ', 'ISOC Board of Trustees ', 'RFC Series Editor ', @@ -114,6 +114,10 @@ def get_from_choices(user): group__acronym='isoc', name="ceo"): f = (FROM_LIST[18],) + elif Role.objects.filter(person=person, + group__acronym='ietf-trust', + name="chair"): + f = (FROM_LIST[12],) # NomCom nomcoms = Role.objects.filter(name="chair", diff --git a/ietf/secr/announcement/views.py b/ietf/secr/announcement/views.py index 75f55edb0..84361ea7a 100644 --- a/ietf/secr/announcement/views.py +++ b/ietf/secr/announcement/views.py @@ -15,12 +15,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, ISOC CEO + the Announcement app. ''' person = user.person - groups_with_access = ("iab", "rsoc", "ietf", "iaoc", "rse", "mentor") + groups_with_access = ("iab", "rsoc", "ietf", "iaoc", "rse", "mentor","ietf-trust") if Role.objects.filter(person=person, group__acronym__in=groups_with_access, name="chair") or has_role(user, ["Secretariat","IAD"]):