From c3a256ef07ae821af0c3efb5a869dbb49d3bc436 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Thu, 13 Feb 2020 07:35:53 +0100
Subject: [PATCH] Tweak accounts handling
---
apimail/api/views.py | 2 ++
apimail/managers.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/apimail/api/views.py b/apimail/api/views.py
index 38f41bf15..8085605ef 100644
--- a/apimail/api/views.py
+++ b/apimail/api/views.py
@@ -18,6 +18,7 @@ from rest_framework.response import Response
from rest_framework import filters, status
from ..models import (
+ EmailAccount,
AttachmentFile,
ComposedMessage,
Event,
@@ -38,6 +39,7 @@ from .serializers import (
class EmailAccountListAPIView(ListAPIView):
permission_classes = (IsAdminUser,)
+ queryset = EmailAccount.objects.all()
serializer_class = EmailAccountSerializer
diff --git a/apimail/managers.py b/apimail/managers.py
index 24d1a087b..f37512358 100644
--- a/apimail/managers.py
+++ b/apimail/managers.py
@@ -36,7 +36,7 @@ class StoredMessageQuerySet(models.QuerySet):
"""
if not user.is_authenticated:
return self.none()
- elif user.is_superuser or user.is_staff:
+ elif (user.is_superuser or user.is_staff) and email is None:
return self
# Filter based on account accesses
--
GitLab