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

shownif is shown if

dj111py38
Jamie Campbell 2015-11-29 02:46:50 -06:00
parent a7088c2586
commit cad2bd3cfb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
questionnaire/views.py
View File

@ -344,8 +344,10 @@ def questionnaire(request, runcode=None, qs=None):
else: else:
request.session['runcode'] = runcode request.session['runcode'] = runcode
args = [] args = []
return HttpResponseRedirect(reverse("questionnaire", args=args)) return HttpResponseRedirect(reverse("questionnaire", args=args))
runinfo = get_runinfo(runcode) runinfo = get_runinfo(runcode)
if not runinfo: if not runinfo:
@ -556,7 +558,6 @@ def show_questionnaire(request, runinfo, errors={}):
# if we got here the questionset will at least contain one question # if we got here the questionset will at least contain one question
# which passes, so this is all we need to check for # which passes, so this is all we need to check for
question_visible = question_satisfies_checks(question, runinfo) or show_all question_visible = question_satisfies_checks(question, runinfo) or show_all
Type = question.get_type() Type = question.get_type()
_qnum, _qalpha = split_numal(question.number) _qnum, _qalpha = split_numal(question.number)
@ -576,7 +577,7 @@ def show_questionnaire(request, runinfo, errors={}):
# add javascript dependency checks # add javascript dependency checks
cd = question.getcheckdict() cd = question.getcheckdict()
depon = cd.get('requiredif', None) or cd.get('dependent', None) depon = cd.get('requiredif', None) or cd.get('dependent', None) or cd.get('shownif', None)
if depon: if depon:
# extra args to BooleanParser are not required for toString # extra args to BooleanParser are not required for toString
parser = BooleanParser(dep_check) parser = BooleanParser(dep_check)