summaryrefslogtreecommitdiff
path: root/service/pixelated
diff options
context:
space:
mode:
authorJefferson Stachelski <jstachel@thoughtworks.com>2015-11-17 11:30:55 -0200
committerJefferson Stachelski <jstachel@thoughtworks.com>2015-11-17 11:33:50 -0200
commitc88514fdf18f39fb67101e3ea9741b3430f221b6 (patch)
tree477291889c4a4524ad71fab80705b341c6e2d37d /service/pixelated
parent83c409e197da1784f9c3f8999a622a62003f85c6 (diff)
Issue #495 Giovane/Jeff: Fixed from undefined
Sent mail doesn't have a from field, so now we are adding it
Diffstat (limited to 'service/pixelated')
-rw-r--r--service/pixelated/adapter/services/mail_service.py1
-rw-r--r--service/pixelated/resources/mail_resource.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py
index 5485ae18..bbaad2c5 100644
--- a/service/pixelated/adapter/services/mail_service.py
+++ b/service/pixelated/adapter/services/mail_service.py
@@ -88,6 +88,7 @@ class MailService(object):
@defer.inlineCallbacks
def send_mail(self, content_dict):
mail = InputMail.from_dict(content_dict)
+ mail.headers['From'] = self.account_email
draft_id = content_dict.get('ident')
yield self.mail_sender.sendmail(mail)
diff --git a/service/pixelated/resources/mail_resource.py b/service/pixelated/resources/mail_resource.py
index 436842fb..14cb047a 100644
--- a/service/pixelated/resources/mail_resource.py
+++ b/service/pixelated/resources/mail_resource.py
@@ -37,9 +37,7 @@ class Mail(Resource):
def render_GET(self, request):
d = self._mail_service.mail(self._mail_id)
-
d.addCallback(lambda mail: respond_json_deferred(mail.as_dict(), request))
-
return NOT_DONE_YET
def render_DELETE(self, request):