diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2015-11-23 18:38:50 -0300 |
|---|---|---|
| committer | Victor Shyba <victor.shyba@gmail.com> | 2015-11-23 18:38:50 -0300 |
| commit | 82c16b35798537302fecbf40ed76b0051e23ddb3 (patch) | |
| tree | 5f67c7ee22b830508eb25c52db95b7007ba8d7ca /service/pixelated/adapter/mailstore/leap_mailstore.py | |
| parent | 958a916cb3ebb6d101cbdbd75473b1b11f30a3e5 (diff) | |
Simplify controller logic on PUT draft
It was checking for mail existence, but thats redundant since its also
checking if draft_id was being sent. Also, its service responsibility to
ensure operation consistency, not the controller.
--Issue #512
Diffstat (limited to 'service/pixelated/adapter/mailstore/leap_mailstore.py')
| -rw-r--r-- | service/pixelated/adapter/mailstore/leap_mailstore.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/service/pixelated/adapter/mailstore/leap_mailstore.py b/service/pixelated/adapter/mailstore/leap_mailstore.py index 4348347e..f59034b8 100644 --- a/service/pixelated/adapter/mailstore/leap_mailstore.py +++ b/service/pixelated/adapter/mailstore/leap_mailstore.py @@ -289,9 +289,8 @@ class LeapMailStore(MailStore): @defer.inlineCallbacks def delete_mail(self, mail_id): message = yield self._fetch_msg_from_soledad(mail_id) - message_wrapper = message.get_wrapper() - if message_wrapper.mdoc.doc_id: - yield message_wrapper.delete(self.soledad) + if message and message.get_wrapper().mdoc.doc_id: + yield message.get_wrapper().delete(self.soledad) @defer.inlineCallbacks def get_mailbox_mail_ids(self, mailbox_name): |