self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-06-04 23:27:34 +02:00
Code Issues Releases Activity

Avoid duplicating relays with alternatives or domains

Browse Source
This commit is contained in:
kaiyou 2017-09-10 20:49:49 +02:00
parent 01ddfef149
commit d4254bfd1f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/mailu/admin/views/alternatives.py
View File

@ -19,7 +19,8 @@ def alternative_create(domain_name):
if form.validate_on_submit(): if form.validate_on_submit():
conflicting_domain = models.Domain.query.get(form.name.data) conflicting_domain = models.Domain.query.get(form.name.data)
conflicting_alternative = models.Alternative.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') flask.flash('Domain %s is already used' % form.name.data, 'error')
else: else:
alternative = models.Alternative(domain=domain) alternative = models.Alternative(domain=domain)

3
admin/mailu/admin/views/domains.py
View File

@ -18,7 +18,8 @@ def domain_create():
if form.validate_on_submit(): if form.validate_on_submit():
conflicting_domain = models.Domain.query.get(form.name.data) conflicting_domain = models.Domain.query.get(form.name.data)
conflicting_alternative = models.Alternative.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') flask.flash('Domain %s is already used' % form.name.data, 'error')
else: else:
domain = models.Domain() domain = models.Domain()