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

Tweaked code to correct access to document metadata and actions, adding RGs to the groups and group secretaries to the roles which are given access.

Browse source 
- Legacy-Id: 5935
This commit is contained in:
Henrik Levkowetz 2013-07-31 17:11:19 +00:00
parent b02d0bdd1c
commit 9f998e5bbc
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/doc/views_doc.py
View file

@ -141,7 +141,7 @@ def document_main(request, name, rev=None):
stream_slugs = StreamName.objects.values_list("slug", flat=True)
can_change_stream = bool(can_edit or (
request.user.is_authenticated() and
Role.objects.filter(name__in=("chair", "secr", "auth"),
Role.objects.filter(name__in=("chair", "secr", "auth", "delegate"),
group__acronym__in=stream_slugs,
person__user=request.user)))
can_edit_iana_state = has_role(request.user, ("Secretariat", "IANA"))
@ -282,8 +282,8 @@ def document_main(request, name, rev=None):
if ((not doc.stream_id or doc.stream_id in ("ietf", "irtf")) and group.type_id == "individ" and
(request.user.is_authenticated() and
Role.objects.filter(person__user=request.user, name__in=("chair", "delegate"),
group__type__in=("wg",),
Role.objects.filter(person__user=request.user, name__in=("chair", "secr", "delegate"),
group__type__in=("wg","rg"),
group__state="active")
or has_role(request.user, "Secretariat"))):
actions.append(("Adopt in Group", urlreverse('edit_adopt', kwargs=dict(name=doc.name))))

2
ietf/ietfauth/utils.py
View file

@ -51,6 +51,8 @@ def has_role(user, role_names):
"IAB Chair": Q(person=person, name="chair", group__acronym="iab"),
"WG Chair": Q(person=person,name="chair", group__type="wg", group__state="active"),
"WG Secretary": Q(person=person,name="secr", group__type="wg", group__state="active"),
"RG Chair": Q(person=person,name="chair", group__type="rg", group__state="active"),
"RG Secretary": Q(person=person,name="secr", group__type="rg", group__state="active"),
}
filter_expr = Q()