Compare commits

..

2 Commits

Author SHA1 Message Date
dgtlmoon
266d3f07f6 Closes #1247 2022-12-22 09:31:45 +01:00
dgtlmoon
08ee223b5f UI - Fix broken html tags in settings page 2022-12-20 18:57:26 +01:00
4 changed files with 9 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
# pip dependencies install stage
FROM python:3.11-slim as builder
FROM python:3.10-slim as builder
# See `cryptography` pin comment in requirements.txt
ARG CRYPTOGRAPHY_DONT_BUILD_RUST=1
@@ -29,7 +29,7 @@ RUN pip install --target=/dependencies playwright~=1.27.1 \
|| echo "WARN: Failed to install Playwright. The application can still run, but the Playwright option will be disabled."
# Final image stage
FROM python:3.11-slim
FROM python:3.10-slim
RUN apt-get update && apt-get install -y --no-install-recommends \
libssl1.1 \

View File

@@ -185,7 +185,7 @@ nav
<div class="pure-control-group">
{{ render_field(form.requests.form.extra_proxies) }}
<div class="pure-form-message-inline">"Name" will be used for selecting the proxy in the Watch Edit settings</span>
<span class="pure-form-message-inline">"Name" will be used for selecting the proxy in the Watch Edit settings</span>
</div>
</div>
<div id="actions">
@@ -194,7 +194,6 @@ nav
<a href="{{url_for('index')}}" class="pure-button button-small button-cancel">Back</a>
<a href="{{url_for('clear_all_history')}}" class="pure-button button-small button-cancel">Clear Snapshot History</a>
</div>
</div>
</form>
</div>

View File

@@ -1,8 +1,7 @@
import os
import time
import re
from flask import url_for
from .util import set_original_response, live_server_setup
from .util import set_original_response, live_server_setup, extract_UUID_from_client
from changedetectionio.model import App
@@ -121,6 +120,10 @@ def run_filter_test(client, content_filter):
notification = f.read()
assert not 'CSS/xPath filter was not present in the page' in notification
# Re #1247 - All tokens got replaced
uuid = extract_UUID_from_client(client)
assert uuid in notification
# cleanup for the next
client.get(
url_for("form_delete", uuid="all"),

View File

@@ -93,7 +93,7 @@ class update_worker(threading.Thread):
return
n_object = {'notification_title': 'Changedetection.io - Alert - CSS/xPath filter was not present in the page',
'notification_body': "Your configured CSS/xPath filters of '{}' for {{watch_url}} did not appear on the page after {} attempts, did the page change layout?\n\nLink: {{base_url}}/edit/{{watch_uuid}}\n\nThanks - Your omniscient changedetection.io installation :)\n".format(
'notification_body': "Your configured CSS/xPath filters of '{}' for {{{{watch_url}}}} did not appear on the page after {} attempts, did the page change layout?\n\nLink: {{{{base_url}}}}/edit/{{{{watch_uuid}}}}\n\nThanks - Your omniscient changedetection.io installation :)\n".format(
", ".join(watch['include_filters']),
threshold),
'notification_format': 'text'}