github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-13 16:52:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't use default subject/body with blank notification text

Browse source 
* Allow different notifications using the media type tags
This commit is contained in:
JonnyWong16 2017-01-29 17:31:47 -08:00
parent 957c7aeab9
commit 304c2429bb
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/interfaces/default/notifiers_table.html
View file

@ -10,7 +10,7 @@ DOCUMENTATION :: END
</%doc> </%doc>
<ul class="stacked-configs list-unstyled"> <ul class="stacked-configs list-unstyled">
% for notifier in sorted(notifiers_list, key=lambda k: (k['agent_label'], k['id'])): % for notifier in sorted(notifiers_list, key=lambda k: (k['agent_label'], k['friendly_name'], k['id'])):
<li class="notification-agent" data-id="${notifier['id']}"> <li class="notification-agent" data-id="${notifier['id']}">
<span> <span>
<span class="toggle-left trigger-tooltip ${'active' if notifier['active'] else ''}" data-toggle="tooltip" data-placement="top" title="Triggers ${'active' if notifier['active'] else 'inactive'}"><i class="fa fa-lg fa-bell"></i></span> <span class="toggle-left trigger-tooltip ${'active' if notifier['active'] else ''}" data-toggle="tooltip" data-placement="top" title="Triggers ${'active' if notifier['active'] else 'inactive'}"><i class="fa fa-lg fa-bell"></i></span>

6
plexpy/notification_handler.py
View file

@ -602,12 +602,6 @@ def build_notify_text(subject='', body='', notify_action=None, parameters=None,
subject = strip_tag(re.sub(pattern, '', subject), agent_id) subject = strip_tag(re.sub(pattern, '', subject), agent_id)
body = strip_tag(re.sub(pattern, '', body), agent_id) body = strip_tag(re.sub(pattern, '', body), agent_id)
# Use default subject and body if they are blank
# only if the notification is not script
if agent_id != 15:
subject = subject or default_subject
body = body or default_body
if test: if test:
return subject, body return subject, body