Manual merge v2 notifications encryption

This commit is contained in:
JonnyWong16 2017-04-19 19:58:39 -07:00
commit 59f12c71a9
11 changed files with 11616 additions and 84 deletions

View file

@ -3083,10 +3083,10 @@ class WebInterface(object):
if notifier:
logger.debug(u"Sending %s%s notification." % (test, notifier['agent_name']))
if notifiers.send_notification(notifier_id=notifier_id,
if notification_handler.notify(notifier_id=notifier_id,
notify_action=notify_action,
subject=subject,
body=body,
notify_action=notify_action,
**kwargs):
return "Notification sent."
else: