EbookFoundation
/
fef-questionnaire
mirror of https://github.com/EbookFoundation/fef-questionnaire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes inconsistency in finish_questionnaire method

EmailTemplateFixes
matteo.cafarotti 2014-10-04 12:42:21 +02:00
parent 1b32db573f
commit 002f8995b4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
questionnaire/views.py
View File

@ -264,7 +264,7 @@ def redirect_to_qs(runinfo, request=None):
# empty ? # empty ?
if not hasquestionset: if not hasquestionset:
logging.warn('no questionset in questionnaire which passes the check') logging.warn('no questionset in questionnaire which passes the check')
return finish_questionnaire(runinfo, qs.questionnaire) return finish_questionnaire(request, runinfo, qs.questionnaire)
if not use_session: if not use_session:
args = [runinfo.random, runinfo.questionset.sortid] args = [runinfo.random, runinfo.questionset.sortid]
@ -468,12 +468,12 @@ def questionnaire(request, runcode=None, qs=None):
request.session['prev_runcode'] = runinfo.random request.session['prev_runcode'] = runinfo.random
if next is None: # we are finished if next is None: # we are finished
return finish_questionnaire(runinfo, questionnaire) return finish_questionnaire(request, runinfo, questionnaire)
transaction.commit() transaction.commit()
return redirect_to_qs(runinfo, request) return redirect_to_qs(runinfo, request)
def finish_questionnaire(runinfo, questionnaire): def finish_questionnaire(request, runinfo, questionnaire):
hist = RunInfoHistory() hist = RunInfoHistory()
hist.subject = runinfo.subject hist.subject = runinfo.subject
hist.runid = runinfo.runid hist.runid = runinfo.runid