mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Bug fix for javascript rendering (#6362)
* Check template name when rendering also * Update i18n.py Enforce stringiness
This commit is contained in:
parent
b29d86403e
commit
b42f3de357
@ -52,7 +52,18 @@ class CustomTranslateNode(TranslateNode):
|
|||||||
# Escape any quotes contained in the string, if the request is for a javascript file
|
# Escape any quotes contained in the string, if the request is for a javascript file
|
||||||
request = context.get('request', None)
|
request = context.get('request', None)
|
||||||
|
|
||||||
if self.escape or (request and request.path.endswith('.js')):
|
template = getattr(context, 'template_name', None)
|
||||||
|
request = context.get('request', None)
|
||||||
|
|
||||||
|
escape = self.escape
|
||||||
|
|
||||||
|
if template and str(template).endswith('.js'):
|
||||||
|
escape = True
|
||||||
|
|
||||||
|
if request and str(request.path).endswith('.js'):
|
||||||
|
escape = True
|
||||||
|
|
||||||
|
if escape:
|
||||||
result = result.replace("'", r'\'')
|
result = result.replace("'", r'\'')
|
||||||
result = result.replace('"', r'\"')
|
result = result.replace('"', r'\"')
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user