entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 13 Releases Wiki Activity

utils: do not raise on Django syntax error in templated_url (#34518)

This commit is contained in:
Nicolas Roche 2019-09-25 18:27:30 +02:00
parent 8a80889198
commit 879be68be4
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
combo/data/models.py
View File

@ -807,7 +807,11 @@ class TextCell(CellBase):
def sub_variadic_url(match):
attribute = match.group(1)
url = match.group(2)
url = utils.get_templated_url(url, context=context)
try:
url = utils.get_templated_url(url, context=context)
except utils.TemplateError as e:
logger = logging.getLogger(__name__)
logger.warning('error in templated URL (%s): %s' % (url, e))
return '%s="%s"' % (attribute, url)
text = re.sub(r'(href|src)="(.*?)"', sub_variadic_url, text)

10
tests/test_pages.py
View File

@ -365,3 +365,13 @@ def test_render(app):
response = app.get(page.get_online_url())
assert '<meta name="description" content="page description" />' in response.text
assert '<title>Combo - foo</title>' in response.text
def test_render_cell_having_href_template_error(app):
page = Page(title=u'foo', slug='foo', template_name='standard-sidebar', order=0, description="page description")
page.save()
cell = TextCell(page=page,
text='<a href="{{e-service_url}}backoffice/...">link</a>',
order=0, placeholder='content')
cell.save()
response = app.get(page.get_online_url())
assert "{{e-service_url}}backoffice/..." in response.text # href not rendered