Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow html inside label and descriptions

Browse Source 
TNL-5557
This commit is contained in:
muhammad-ammar
2016-09-19 16:22:58 +05:00
parent 2b80c61980
commit 6ff762b63e
15 changed files with 259 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/lib/capa/capa/capa_problem.py
View File

@@ -31,6 +31,8 @@ import capa.responsetypes as responsetypes
from capa.util import contextualize_text, convert_files_to_filenames
import capa.xqueue_interface as xqueue_interface
from capa.safe_exec import safe_exec
from openedx.core.djangolib.markup import HTML
from xmodule.stringify import stringify_children
# extra things displayed after "show answers" is pressed
@@ -926,7 +928,7 @@ class LoncapaProblem(object):
group_label_tag.tag = 'p'
group_label_tag.set('id', responsetype_id)
group_label_tag.set('class', 'multi-inputs-group-label')
group_label_tag_text = group_label_tag.text
group_label_tag_text = stringify_children(group_label_tag)
for inputfield in inputfields:
problem_data[inputfield.get('id')] = {
@@ -938,7 +940,7 @@ class LoncapaProblem(object):
# Extract label value from <label> tag or label attribute from inside the responsetype
responsetype_label_tag = response.find('label')
if responsetype_label_tag is not None:
label = responsetype_label_tag.text
label = stringify_children(responsetype_label_tag)
# store <label> tag containing question text to delete
# it later otherwise question will be rendered twice
element_to_be_deleted = responsetype_label_tag
@@ -950,21 +952,15 @@ class LoncapaProblem(object):
p_tag = response.xpath('preceding-sibling::*[1][self::p]')
if p_tag and p_tag[0].text == inputfields[0].attrib['label']:
label = p_tag[0].text
p_tag_children = list(p_tag[0])
if len(p_tag_children) == 0:
element_to_be_deleted = p_tag[0]
else:
# Delete the text from the p-tag, but leave the children.
p_tag[0].text = ''
label = stringify_children(p_tag[0])
element_to_be_deleted = p_tag[0]
else:
# In this case the problems don't have tag or label attribute inside the responsetype
# so we will get the first preceding label tag w.r.t to this responsetype.
# This will take care of those multi-question problems that are not using --- in their markdown.
label_tag = response.xpath('preceding-sibling::*[1][self::label]')
if label_tag:
label = label_tag[0].text
label = stringify_children(label_tag[0])
element_to_be_deleted = label_tag[0]
# delete label or p element only if inputtype is fully accessible
@@ -978,11 +974,11 @@ class LoncapaProblem(object):
for description in description_tags:
descriptions[
"description_%s_%i" % (responsetype_id, description_id)
] = description.text
] = HTML(stringify_children(description))
response.remove(description)
description_id += 1
problem_data[inputfields[0].get('id')] = {
'label': label.strip() if label else '',
'label': HTML(label.strip()) if label else '',
'descriptions': descriptions
}