inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 20:16:44 +00:00
Code

Bug fix for javascript rendering (#6362) (#6363)

Browse Source 
* Check template name when rendering also

* Update i18n.py

Enforce stringiness

(cherry picked from commit b42f3de3577f754c76c5a8afb0d93d632cc1e439)

Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
This commit is contained in:
github-actions[bot] 2024-01-30 11:03:35 +11:00 committed by GitHub
parent c12e6dbf42
commit 9494a8ad43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
InvenTree/part/templatetags/i18n.py
View File

@ -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'\"')