From eb69b9e14bfa5f04dc8aa8e28554daae4b6e9c46 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Fri, 3 Jan 2020 15:55:48 +0000 Subject: [PATCH] Improve can_ballot. Fixes #2856. Commit ready for merge. - Legacy-Id: 17177 --- ietf/doc/templatetags/ietf_filters.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py index 0e823429b..61fe9404c 100644 --- a/ietf/doc/templatetags/ietf_filters.py +++ b/ietf/doc/templatetags/ietf_filters.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007-2019, All Rights Reserved +# Copyright The IETF Trust 2007-2020, All Rights Reserved # -*- coding: utf-8 -*- @@ -551,9 +551,9 @@ def can_defer(user,doc): @register.filter() def can_ballot(user,doc): - if doc.stream_id == 'ietf' and user.person.role_set.filter(name="ad", group__type="area", group__state="active"): - return True - elif doc.stream_id == 'irtf' and has_role(user,'IRSG Member'): - return True + # Only IRSG memebers (and the secretariat, handled by code separately) can take positions on IRTF documents + # Otherwise, an AD can take a position on anything that has a ballot open + if doc.type_id == 'draft' and doc.stream_id == 'irtf': + return has_role(user,'IRSG Member') else: - return False + return user.person.role_set.filter(name="ad", group__type="area", group__state="active")