mirror
/
changedetection.io
kopia lustrzana https://github.com/dgtlmoon/changedetection.io
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

"Send Test Notification" - In "Group" settings form it should not fallback to the system wide notifications when sending a test if nothing is set.

pull/2305/head
dgtlmoon 2024-04-03 17:10:13 +02:00
rodzic 8aac7bccbe
commit db59bf73e1
2 zmienionych plików z 3 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
changedetectionio/blueprint/tags/templates/edit-tag.html
Wyświetl plik

@ -3,7 +3,7 @@
{% from '_helpers.jinja' import render_field, render_checkbox_field, render_button %} {% from '_helpers.jinja' import render_field, render_checkbox_field, render_button %}
{% from '_common_fields.jinja' import render_common_settings_form %} {% from '_common_fields.jinja' import render_common_settings_form %}
<script> <script>
const notification_base_url="{{url_for('ajax_callback_send_notification_test', watch_uuid=uuid)}}"; const notification_base_url="{{url_for('ajax_callback_send_notification_test', mode="group-settings")}}";
</script> </script>
<script src="{{url_for('static_content', group='js', filename='tabs.js')}}" defer></script> <script src="{{url_for('static_content', group='js', filename='tabs.js')}}" defer></script>

3
changedetectionio/flask_app.py
Wyświetl plik

@ -527,7 +527,8 @@ def changedetection_app(config=None, datastore_o=None):
notification_urls = tag.get('notifications_urls') if tag and tag.get('notifications_urls') else None notification_urls = tag.get('notifications_urls') if tag and tag.get('notifications_urls') else None
is_global_settings_form = request.args.get('mode', '') == 'global-settings' is_global_settings_form = request.args.get('mode', '') == 'global-settings'
if not notification_urls and not is_global_settings_form: is_group_settings_form = request.args.get('mode', '') == 'group-settings'
if not notification_urls and not is_global_settings_form and not is_group_settings_form:
# In the global settings, use only what is typed currently in the text box # In the global settings, use only what is typed currently in the text box
logger.debug("Test notification - Trying by global system settings notifications") logger.debug("Test notification - Trying by global system settings notifications")
if datastore.data['settings']['application'].get('notification_urls'): if datastore.data['settings']['application'].get('notification_urls'):