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>

diff --git a/src/notifier/dispatchers.py b/src/notifier/dispatchers.py
index 64be2a5..c35fe2b 100644 (file)
--- a/src/notifier/dispatchers.py
+++ b/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/worker/requirements.txt b/worker/requirements.txt
index f80f1c0..0d864d3 100644 (file)
--- a/worker/requirements.txt
+++ b/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