diff options
| author |   Sawyer Bergeron <sbergeron@iol.unh.edu> | 2018-01-09 10:12:20 -0500 |
|---|---|---|
| committer | Sawyer Bergeron <sbergeron@iol.unh.edu> | 2018-01-09 18:19:21 +0000 |
| commit | 8b95b59cf61a2ae741678677b6c142c09280e0a3 (patch) | |
| tree | 654b7f577ad01cb8d0b3bd2699389cb97e934143 | |
| parent | 830e8ee9ec76f426abc59e9b88ccb7ceeedcc8e8 (diff) | |
Fixes for Recent Merge
Jira: None
In a recent large merge, some code was lost in translation.
This commit fixes a missing line in requirements.txt and
removes a couple lines in dispatchers.py that lost relevance.
Change-Id: I5ddf67fc1da6df40f84d60668cd59e6a1975912d
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
| -rw-r--r-- | dashboard/src/notifier/dispatchers.py | 7 | ||||
| -rw-r--r-- | dashboard/worker/requirements.txt | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dashboard/src/notifier/dispatchers.py b/dashboard/src/notifier/dispatchers.py index 64be2a5..c35fe2b 100644 --- a/dashboard/src/notifier/dispatchers.py +++ b/dashboard/src/notifier/dispatchers.py @@ -26,9 +26,8 @@ class DispatchHandler(): def email(instance): if instance.msg_sent != 'no dispatcher by given name exists: sending by email': instance.msg_sent = 'by email' - send_mail(instance.title,instance.content + - '\n\n This message pertains to the following resource: ' + - instance.resource.name,instance.sender,[instance.user.email_addr], fail_silently=False) + send_mail(instance.title,instance.content, + instance.sender,[instance.user.email_addr], fail_silently=False) def webnotification(instance): - instance.msg_sent='by web notification' + instance.msg_sent='by web notification'
\ No newline at end of file diff --git a/dashboard/worker/requirements.txt b/dashboard/worker/requirements.txt index f80f1c0..0d864d3 100644 --- a/dashboard/worker/requirements.txt +++ b/dashboard/worker/requirements.txt @@ -15,3 +15,4 @@ pika==0.10.0 psycopg2==2.6.2 PyJWT==1.4.2 requests==2.11.0 +django-fernet-fields==0.5 |