Skip to content

fix: include outbound constraints in sreq update notification email #4620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 2 commits into from
Oct 21, 2022
Merged

fix: include outbound constraints in sreq update notification email #4620

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c193a5
fix: include outbound constraints in sreq update notification email
jennifer-richards Oct 20, 2022
fbdb1ac
style: clean up whitespace
jennifer-richards Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions ietf/secr/sreq/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,16 @@ def status_slug_for_new_session(session, session_number):
return 'schedw'


def get_outbound_conflicts(form: SessionForm):
"""extract wg conflict constraint data from a SessionForm"""
outbound_conflicts = []
for conflictname, cfield_id in form.wg_constraint_field_ids():
conflict_groups = form.cleaned_data[cfield_id]
if len(conflict_groups) > 0:
outbound_conflicts.append(dict(name=conflictname, groups=conflict_groups))
return outbound_conflicts


@role_required(*AUTHORIZED_ROLES)
def confirm(request, acronym):
'''
Expand Down Expand Up @@ -299,12 +309,8 @@ def confirm(request, acronym):
session_data['timeranges_display'] = [t.desc for t in form.cleaned_data['timeranges']]
session_data['resources'] = [ ResourceAssociation.objects.get(pk=pk) for pk in request.POST.getlist('resources') ]

# extract wg conflict constraint data for the view
outbound_conflicts = []
for conflictname, cfield_id in form.wg_constraint_field_ids():
conflict_groups = form.cleaned_data[cfield_id]
if len(conflict_groups) > 0:
outbound_conflicts.append(dict(name=conflictname, groups=conflict_groups))
# extract wg conflict constraint data for the view / notifications
outbound_conflicts = get_outbound_conflicts(form)

button_text = request.POST.get('submit', '')
if button_text == 'Cancel':
Expand Down Expand Up @@ -534,11 +540,14 @@ def edit(request, acronym, num=None):
#add_session_activity(group,'Session Request was updated',meeting,user)

# send notification
outbound_conflicts = get_outbound_conflicts(form)
session_data = form.cleaned_data.copy() # do not add things to the original cleaned_data
session_data['outbound_conflicts'] = [f"{d['name']}: {d['groups']}" for d in outbound_conflicts]
send_notification(
group,
meeting,
login,
form.cleaned_data,
session_data,
[sf.cleaned_data for sf in form.session_forms.forms_to_keep],
'update',
)
Expand Down