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

fix: Don't add "essential people" to session requests by default (#5734)

Browse source 
* fix: Don't add "essential people" to session requests by default

Because since #5169 we ask they not be included anymore. (This was part of my
original change but I guess I forgot to add it to the PR...)

* Don't import Person
This commit is contained in:
Lars Eggert 2023-06-08 21:48:53 +03:00 committed by GitHub
parent d565c349ce
commit cc35a2d678
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ietf/secr/sreq/views.py
View file

@ -25,7 +25,6 @@ from ietf.secr.sreq.forms import (SessionForm, ToolStatusForm, allowed_conflicti
from ietf.secr.utils.decorators import check_permissions
from ietf.secr.utils.group import get_my_groups
from ietf.utils.mail import send_mail
from ietf.person.models import Person
from ietf.mailtrigger.utils import gather_address_lists
# -------------------------------------------------
@ -404,15 +403,6 @@ def confirm(request, acronym):
'group': group,
'session_conflicts': session_conflicts},
)
#Move this into make_initial
def add_essential_people(group,initial):
# This will be easier when the form uses Person instead of Email
people = set()
if 'bethere' in initial:
people.update(initial['bethere'])
people.update(Person.objects.filter(role__group=group, role__name__in=['chair','ad']))
initial['bethere'] = list(people)
def session_changed(session):
@ -699,14 +689,12 @@ def new(request, acronym):
return redirect('ietf.secr.sreq.views.new', acronym=acronym)
initial = get_initial_session(previous_sessions, prune_conflicts=True)
add_essential_people(group,initial)
if 'resources' in initial:
initial['resources'] = [x.pk for x in initial['resources']]
form = SessionForm(group, meeting, initial=initial, notifications_optional=has_role(request.user, "Secretariat"))
else:
initial={}
add_essential_people(group,initial)
form = SessionForm(group, meeting, initial=initial, notifications_optional=has_role(request.user, "Secretariat"))
return render(request, 'sreq/new.html', {