ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Update mutation to pass test

This commit is contained in:
Ramon Wenger 2022-02-24 16:24:42 +01:00
parent 3034f77640
commit b5ffb3ee29
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/books/schema/mutations/contentblock.py
View File

@ -10,7 +10,7 @@ from books.models import ContentBlock, Chapter, SchoolClass
from books.schema.inputs import ContentBlockInput from books.schema.inputs import ContentBlockInput
from ..nodes import ContentBlockNode from ..nodes import ContentBlockNode
from core.utils import set_hidden_for, set_visible_for from core.utils import set_hidden_for, set_visible_for
from .utils import handle_content_block, set_user_defined_block_type from .utils import handle_content_block, handle_text, set_user_defined_block_type
class MutateContentBlock(relay.ClientIDMutation): class MutateContentBlock(relay.ClientIDMutation):

9
server/books/schema/mutations/utils.py
View File

@ -20,7 +20,12 @@ class AssignmentParameterException(Exception):
pass pass
def newlines_to_paragraphs(text): def handle_text(text):
is_list = bool(re.search(r'<ul>', text))
if is_list:
# let's assume this is formatted correctly already, otherwise bleach or the browser should strip / ignore it
return text
else:
parts = re.split(r'[\r\n]+', text) parts = re.split(r'[\r\n]+', text)
paragraphs = ['<p>{}</p>'.format(p.strip()) for p in parts] paragraphs = ['<p>{}</p>'.format(p.strip()) for p in parts]
return '\n'.join(paragraphs) return '\n'.join(paragraphs)
@ -49,7 +54,7 @@ def handle_content_block(content, context=None, module=None, allowed_blocks=ALLO
return { return {
'type': 'text_block', 'type': 'text_block',
'value': { 'value': {
'text': newlines_to_paragraphs(bleach.clean(content['value']['text'], strip=True)) 'text': handle_text(bleach.clean(content['value']['text'], strip=True))
}} }}
elif content['type'] == 'assignment': elif content['type'] == 'assignment':
if module is None: if module is None: