diff --git a/ietf/secr/proceedings/proc_utils.py b/ietf/secr/proceedings/proc_utils.py index 09c6246da..7e248a6c5 100644 --- a/ietf/secr/proceedings/proc_utils.py +++ b/ietf/secr/proceedings/proc_utils.py @@ -558,7 +558,6 @@ def gen_progress(context, final=True): path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'progress-report.html') write_html(path,html.content) -@debug.trace def gen_research(context): meeting = context['meeting'] gmet, gnot = groups_by_session(None,meeting) diff --git a/ietf/secr/sreq/views.py b/ietf/secr/sreq/views.py index db411d90b..ea049177c 100644 --- a/ietf/secr/sreq/views.py +++ b/ietf/secr/sreq/views.py @@ -273,13 +273,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 p in form['bethere']: + for p in form.get('bethere', []): Constraint.objects.create(name=bethere_cn, source=group, person=p, meeting=new_session.meeting) # deprecated in new schema @@ -453,6 +453,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', {