lee/changedetection.io
1
0
Fork 0
mirror of https://github.com/dgtlmoon/changedetection.io.git synced 2025-12-12 19:16:40 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
dgtlmoon
2022-12-04 11:38:47 +01:00
parent bba10afd97
commit 8bceb0abd4
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
changedetectionio/forms.py
View File

@@ -206,6 +206,13 @@ class ValidateJinja2Template(object):
from jinja2 import Environment, BaseLoader, TemplateSyntaxError
from jinja2.meta import find_undeclared_variables
regex = re.compile('{{(.*?)}}')
valid_tokens = list(notification.valid_tokens.keys())
for p in re.findall(regex, field.data):
if not p.strip() in valid_tokens:
message = field.gettext('Token \'%s\' is not a valid token or is unknown')
raise ValidationError(message % (p))
try:
jinja2_env = Environment(loader=BaseLoader)
jinja2_env.globals.update(notification.valid_tokens)
@@ -220,12 +227,6 @@ class ValidateJinja2Template(object):
f"The following tokens used in the notification are not valid: {undefined}"
)
regex = re.compile('{{(.*?)}}')
valid_tokens = list(notification.valid_tokens.keys())
for p in re.findall(regex, field.data):
if not p.strip() in valid_tokens:
message = field.gettext('Token \'%s\' is not a valid token.')
raise ValidationError(message % (p))
class validateURL(object):