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

Allow program leads to request meetings. Fixes #3141. Commit ready for merge.

Browse source 
- Legacy-Id: 18718
This commit is contained in:
Robert Sparks 2020-11-23 20:36:47 +00:00
parent 7e384a8aea
commit 643749316b
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/group/views.py
View file

@ -767,7 +767,7 @@ def meetings(request, acronym=None, group_type=None):
future, in_progress, recent, past = group_sessions(sessions) future, in_progress, recent, past = group_sessions(sessions)
can_edit = group.has_role(request.user,["Chair","Secretary"]) can_edit = group.has_role(request.user,group.features.groupman_roles)
can_always_edit = has_role(request.user,["Secretariat","Area Director"]) can_always_edit = has_role(request.user,["Secretariat","Area Director"])
return render(request,'group/meetings.html', return render(request,'group/meetings.html',

10
ietf/secr/utils/decorators.py
View file

@ -10,7 +10,7 @@ from django.utils.http import urlquote
from ietf.ietfauth.utils import has_role from ietf.ietfauth.utils import has_role
from ietf.doc.models import Document from ietf.doc.models import Document
from ietf.group.models import Group, Role from ietf.group.models import Group
from ietf.meeting.models import Session from ietf.meeting.models import Session
from ietf.secr.utils.meeting import get_timeslot from ietf.secr.utils.meeting import get_timeslot
from ietf.utils.response import permission_denied from ietf.utils.response import permission_denied
@ -65,11 +65,9 @@ def check_permissions(func):
except ObjectDoesNotExist: except ObjectDoesNotExist:
permission_denied(request, "User not authorized to access group: %s" % group.acronym) permission_denied(request, "User not authorized to access group: %s" % group.acronym)
groups = [group] if login.role_set.filter(name__in=group.features.groupman_roles,group=group):
if group.parent: return func(request, *args, **kwargs)
groups.append(group.parent) elif group.parent and login.role_set.filter(name__in=group.parent.features.groupman_roles,group=group.parent):
all_roles = Role.objects.filter(group__in=groups,name__in=('ad','chair','secr'))
if login in [ r.person for r in all_roles ]:
return func(request, *args, **kwargs) return func(request, *args, **kwargs)
# if session is plenary allow ietf/iab chairs # if session is plenary allow ietf/iab chairs