summaryrefslogtreecommitdiff
path: root/service/pixelated/controllers
diff options
context:
space:
mode:
authorLisa Junger <ljunger@thoughtworks.com>2014-10-20 12:20:04 +0200
committerLisa Junger <ljunger@thoughtworks.com>2014-10-20 12:26:30 +0200
commit6ddbfc0e6399d9b994ecd4c2c4b040aa6d364eac (patch)
tree5428dab74ddb626903dbb5be0e82ef82ce7d21b1 /service/pixelated/controllers
parent15321219b05c5eb7f29e45587fcaa3c45e9a9dd7 (diff)
adds permant deleted for trashed messages.
Diffstat (limited to 'service/pixelated/controllers')
-rw-r--r--service/pixelated/controllers/mails_controller.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/service/pixelated/controllers/mails_controller.py b/service/pixelated/controllers/mails_controller.py
index b039495f..e85d338d 100644
--- a/service/pixelated/controllers/mails_controller.py
+++ b/service/pixelated/controllers/mails_controller.py
@@ -70,8 +70,12 @@ class MailsController:
return ""
def delete_mail(self, mail_id):
- trashed_mail = self._mail_service.delete_mail(mail_id)
- self._search_engine.index_mail(trashed_mail)
+ mail = self._mail_service.mail(mail_id)
+ if mail.mailbox_name == 'TRASH':
+ self._mail_service.delete_permanent(mail_id)
+ else:
+ trashed_mail = self._mail_service.delete_mail(mail_id)
+ self._search_engine.index_mail(trashed_mail)
return respond_json(None)
def delete_mails(self):