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
This commit is contained in:
parent
ac5e4b9b4c
commit
09d7255e4a
|
@ -279,13 +279,13 @@ def confirm(request, acronym):
|
|||
new_session.resources = form['resources']
|
||||
|
||||
# write constraint records
|
||||
save_conflicts(group,meeting,form['conflict1'],'conflict')
|
||||
save_conflicts(group,meeting,form['conflict2'],'conflic2')
|
||||
save_conflicts(group,meeting,form['conflict3'],'conflic3')
|
||||
save_conflicts(group,meeting,form.get('conflict1',''),'conflict')
|
||||
save_conflicts(group,meeting,form.get('conflict2',''),'conflic2')
|
||||
save_conflicts(group,meeting,form.get('conflict3',''),'conflic3')
|
||||
|
||||
if 'bethere' in form:
|
||||
bethere_cn = ConstraintName.objects.get(slug='bethere')
|
||||
for email in form['bethere']:
|
||||
for email in form.get('bethere'):
|
||||
Constraint.objects.create(name=bethere_cn,source=group,person=email.person,meeting=new_session.meeting)
|
||||
|
||||
# deprecated in new schema
|
||||
|
@ -465,6 +465,8 @@ def edit_mtg(request, num, acronym):
|
|||
return redirect('sessions_view', acronym=acronym)
|
||||
|
||||
else:
|
||||
if not sessions:
|
||||
return redirect('sessions_new', acronym=acronym)
|
||||
form = SessionForm(initial=initial)
|
||||
|
||||
return render_to_response('sreq/edit.html', {
|
||||
|
|
Loading…
Reference in a new issue