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

Add notifier id to config modal

Browse source
This commit is contained in:
JonnyWong16 2016-10-01 13:38:41 -07:00 • committed by JonnyWong16
commit 1206d13978
5 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plexpy/notifiers.py
View file

@ -323,17 +323,21 @@ def get_notify_actions():
def get_notifiers(notifier_id=None, notify_action=None):
notify_actions = get_notify_actions()
where_action = ''
if notify_action and notify_action in notify_actions:
where_action = 'WHERE %s = 1 ' % notify_action
where = where_id = where_action = ''
if notifier_id or notify_action:
where = 'WHERE '
if notifier_id:
where_id += 'notifier_id = %s' % notifier_id
if notify_action and notify_action in notify_actions:
where_action = '%s = 1' % notify_action
where += ' AND '.join([w for w in [where_id, where_action] if w])
monitor_db = database.MonitorDatabase()
result = monitor_db.select('SELECT id, agent_id, agent_name, agent_label, friendly_name, %s FROM notifiers %s'
% (', '.join(notify_actions), where_action))
% (', '.join(notify_actions), where))
for item in result:
item['actions'] = {k: helpers.cast_to_int(item.pop(k))
for k in item.keys() if k in notify_actions}
item['active'] = int(any([item.pop(k) for k in item.keys() if k in notify_actions]))
return sorted(result, key=lambda k: (k['agent_label'], k['id']))

5
plexpy/webserve.py
View file

@ -2863,10 +2863,7 @@ class WebInterface(object):
"agent_name": "telegram",
"agent_label": "Telegram",
"friendly_name": "",
"actions": {"on_play": 0,
"on_stop": 0,
...
},
"active": 1
}
]
```