Update access to user mailbox

modoboa · Sep 28, 2015 · a4b9395 · a4b9395
1 parent 7536721
commit a4b9395
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modoboa_webmail/app_settings.py b/modoboa_webmail/app_settings.py
@@ -149,7 +149,7 @@ class UserSettings(UserParametersForm):
 
     @staticmethod
     def has_access(user):
-        return user.mailbox_set.count() != 0
+        return hasattr(user, "mailbox")
 
     def clean_mboxes_col_width(self):
         """Check if the entered value is a positive integer.

diff --git a/modoboa_webmail/general_callbacks.py b/modoboa_webmail/general_callbacks.py
@@ -10,7 +10,7 @@
 def menu(target, user):
     if target != "top_menu":
         return []
-    if not user.mailbox_set.count():
+    if not hasattr(user, "mailbox"):
         return []
     return [
         {"name": "webmail",
@@ -24,7 +24,7 @@ def userlogout(request):
     from .lib import IMAPconnector
     from .exceptions import ImapError
 
-    if not request.user.mailbox_set.count():
+    if not hasattr(request.user, "mailbox"):
         return
     try:
         m = IMAPconnector(user=request.user.username,