Skip to content

Commit 09d7255

Browse files
committed
fix bug when trying to edit a session request that doesn't exist. fix bug when submitted session request form does not include conflict input fields. Commit ready for merge.
- Legacy-Id: 8456
1 parent ac5e4b9 commit 09d7255

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

ietf/secr/sreq/views.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,13 @@ def confirm(request, acronym):
279279
new_session.resources = form['resources']
280280

281281
# write constraint records
282-
save_conflicts(group,meeting,form['conflict1'],'conflict')
283-
save_conflicts(group,meeting,form['conflict2'],'conflic2')
284-
save_conflicts(group,meeting,form['conflict3'],'conflic3')
282+
save_conflicts(group,meeting,form.get('conflict1',''),'conflict')
283+
save_conflicts(group,meeting,form.get('conflict2',''),'conflic2')
284+
save_conflicts(group,meeting,form.get('conflict3',''),'conflic3')
285285

286286
if 'bethere' in form:
287287
bethere_cn = ConstraintName.objects.get(slug='bethere')
288-
for email in form['bethere']:
288+
for email in form.get('bethere'):
289289
Constraint.objects.create(name=bethere_cn,source=group,person=email.person,meeting=new_session.meeting)
290290

291291
# deprecated in new schema
@@ -465,6 +465,8 @@ def edit_mtg(request, num, acronym):
465465
return redirect('sessions_view', acronym=acronym)
466466

467467
else:
468+
if not sessions:
469+
return redirect('sessions_new', acronym=acronym)
468470
form = SessionForm(initial=initial)
469471

470472
return render_to_response('sreq/edit.html', {

0 commit comments

Comments
 (0)