diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py index 4c5a07a3..b033d7d6 100644 --- a/app/dashboard/views/index.py +++ b/app/dashboard/views/index.py @@ -178,7 +178,7 @@ def index(): ) ) - mailboxes = current_user.mailboxes() + mailboxes = [mb for mb in current_user.mailboxes() if not mb.is_admin_disabled()] show_intro = False if not current_user.intro_shown: diff --git a/templates/dashboard/index.html b/templates/dashboard/index.html index 1e7ddb2f..b5232e89 100644 --- a/templates/dashboard/index.html +++ b/templates/dashboard/index.html @@ -403,8 +403,20 @@ in the last 14 days See All  → - {% if mailboxes|length > 1 %} + {% set has_admin_disabled_mailbox = namespace(value=false) %} + {% for mb in alias_info.mailboxes %} + {% if mb.is_admin_disabled() %} + {% set has_admin_disabled_mailbox.value = true %} + {% endif %} + {% endfor %} + {% if mailboxes|length > 1 or has_admin_disabled_mailbox.value %} + {% if has_admin_disabled_mailbox.value %} +
+ + The alias uses a mailbox disabled by an admin. Please change it to an active mailbox. +
+ {% endif %}
Current mailbox