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

Merged in [8146] from sunqi.csnet.thu@gmail.com:

Browse source 
Changed the ietfauth file to allow to change the replaces relationship without setting the doc stream. Fixes ticket #1305.
 - Legacy-Id: 8157
Note: SVN reference [8146] has been migrated to Git commit 03711ef538
This commit is contained in:
Henrik Levkowetz 2014-07-21 20:02:34 +00:00
parent 712c89f149 03711ef538
commit 22e006aba2
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ietf/ietfauth/utils.py
View file

@ -101,25 +101,28 @@ def is_authorized_in_doc_stream(user, doc):
if has_role(user, ["Secretariat"]):
return True
if not doc.stream or not user.is_authenticated():
if not user.is_authenticated():
return False
# must be authorized in the stream or group
group_req = None
if (doc.stream.slug == "ietf" or not doc.stream) and has_role(user, ["Area Director"]):
return True
if not doc.stream:
return False
if doc.stream.slug == "ietf" and doc.group.type == "individ":
return False
if doc.stream.slug == "ietf":
if has_role(user, ["Area Director"]):
return True
if not doc.group.type == "individ":
group_req = Q(group=doc.group)
group_req = Q(group=doc.group)
elif doc.stream.slug == "irtf":
group_req = Q(group__acronym=doc.stream.slug) | Q(group=doc.group)
elif doc.stream.slug in ("iab", "ise"):
group_req = Q(group__acronym=doc.stream.slug)
if not group_req:
return False
return bool(Role.objects.filter(Q(name__in=("chair", "secr", "delegate", "auth"), person__user=user) & group_req))