From 3480e187a39c15c4d5cd4c8fb21bcba0ed41f8b8 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 16 Jan 2017 09:59:33 +0100 Subject: [PATCH] Do not include internal aliases in counter. fix #1001 --- modoboa/admin/models/domain.py | 2 +- modoboa/admin/tests/test_domain.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modoboa/admin/models/domain.py b/modoboa/admin/models/domain.py index c17e87bcf..4094b73ef 100644 --- a/modoboa/admin/models/domain.py +++ b/modoboa/admin/models/domain.py @@ -76,7 +76,7 @@ class Domain(AdminObject): @property def mbalias_count(self): - return self.alias_set.count() + return self.alias_set.filter(internal=False).count() @property def identities_count(self): diff --git a/modoboa/admin/tests/test_domain.py b/modoboa/admin/tests/test_domain.py index d36d7d358..490253ec2 100644 --- a/modoboa/admin/tests/test_domain.py +++ b/modoboa/admin/tests/test_domain.py @@ -144,6 +144,14 @@ class DomainTestCase(ModoTestCase): with self.assertRaises(Domain.DoesNotExist): Domain.objects.get(pk=1) + def test_domain_counters(self): + """Check counters at domain level.""" + domain = Domain.objects.get(name="test.com") + self.assertEqual(domain.domainalias_count, 0) + self.assertEqual(domain.mailbox_count, 2) + self.assertEqual(domain.mbalias_count, 3) + self.assertEqual(domain.identities_count, 5) + def test_domain_flat_list(self): """Test the 'domain_flat_list' view.""" response = self.client.get(reverse("admin:domain_flat_list"))