Skip to content

Commit

Permalink
Improve validation for ReactiveHTML validation (#2332)
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr committed May 20, 2021
1 parent cdbfc3f commit da3d8bc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
4 changes: 4 additions & 0 deletions panel/models/reactive_html.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ def handle_data(self, data):
elif nloops:
loop = [loop for loop in (list_loop, values_loop, items_loop) if loop][0]
var, obj = loop[0]
if var in self.cls.param:
raise ValueError(f'Loop variable {var} clashes with parameter name. '
'Ensure loop variables have a unique name. Relevant '
f'template section:\n\n{data}')
self.loop_map[var] = obj

if '{% for ' in data:
Expand Down
9 changes: 8 additions & 1 deletion panel/reactive.py
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,14 @@ def _get_template(self):
context[parameter] = value
if parameter in self._child_names:
context[f'{parameter}_names'] = self._child_names[parameter]
html = template.render(context)
try:
html = template.render(context)
except Exception as e:
raise RuntimeError(
f"{type(self).__name__} could not render "
f"template, errored with:\n\n{type(e).__name__}: {e}.\n"
f"Full template:\n\n{template_string}"
)

# Parse templated HTML
parser = ReactiveHTMLParser(self.__class__, template=False)
Expand Down

0 comments on commit da3d8bc

Please sign in to comment.