github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't forget the primary address.

Browse Source
This commit is contained in:
Antoine Nguyen
2013-12-02 10:10:03 +01:00
parent 5d52b2ee60
commit 4081d5c816
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/extensions/amavis/views.py
+8 -2
View File
@@ -188,13 +188,18 @@ def delete_selfservice(request, mail_id):
@selfservice(delete_selfservice)
def delete(request, mail_id):
"""Delete message selection.
:param str mail_id: message unique identifier
"""
mail_id = check_mail_id(request, mail_id)
wrapper = get_wrapper()
mb = Mailbox.objects.get(user=request.user) \
if request.user.group == 'SimpleUsers' else None
for mid in mail_id:
r, i = mid.split()
if mb is not None and not r in mb.alias_addresses:
if mb is not None and r != mb.full_address \
and not r in mb.alias_addresses:
continue
msgrcpt = wrapper.get_recipient_message(r, i)
msgrcpt.rs = 'D'
@@ -247,7 +252,8 @@ def release(request, mail_id):
if request.user.group == 'SimpleUsers' else None
for mid in mail_id:
r, i = mid.split()
if mb is not None and not r in mb.alias_addresses:
if mb is not None and r != mb.full_address \
and not r in mb.alias_addresses:
continue
msgrcpts += [wrapper.get_recipient_message(r, i)]
if mb is not None and parameters.get_admin("USER_CAN_RELEASE") == "no":