From d4254bfd1f1b0e87c2d2d32ddb1b4985853f4ebc Mon Sep 17 00:00:00 2001 From: kaiyou Date: Sun, 10 Sep 2017 20:49:49 +0200 Subject: [PATCH] Avoid duplicating relays with alternatives or domains --- admin/mailu/admin/views/alternatives.py | 3 ++- admin/mailu/admin/views/domains.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/admin/mailu/admin/views/alternatives.py b/admin/mailu/admin/views/alternatives.py index b3b4ab3b..ce237d45 100644 --- a/admin/mailu/admin/views/alternatives.py +++ b/admin/mailu/admin/views/alternatives.py @@ -19,7 +19,8 @@ def alternative_create(domain_name): if form.validate_on_submit(): conflicting_domain = models.Domain.query.get(form.name.data) conflicting_alternative = models.Alternative.query.get(form.name.data) - if conflicting_domain or conflicting_alternative: + conflicting_relay = models.Relay.query.get(form.name.data) + if conflicting_domain or conflicting_alternative or conflicting_relay: flask.flash('Domain %s is already used' % form.name.data, 'error') else: alternative = models.Alternative(domain=domain) diff --git a/admin/mailu/admin/views/domains.py b/admin/mailu/admin/views/domains.py index 371b46f9..cebe5c8b 100644 --- a/admin/mailu/admin/views/domains.py +++ b/admin/mailu/admin/views/domains.py @@ -18,7 +18,8 @@ def domain_create(): if form.validate_on_submit(): conflicting_domain = models.Domain.query.get(form.name.data) conflicting_alternative = models.Alternative.query.get(form.name.data) - if conflicting_domain or conflicting_alternative: + conflicting_relay = models.Relay.query.get(form.name.data) + if conflicting_domain or conflicting_alternative or conflicting_relay: flask.flash('Domain %s is already used' % form.name.data, 'error') else: domain = models.Domain()