github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Antoine Nguyen
2015-01-26 21:52:58 +01:00
parent 9bd206768e 6fbdc0e679
commit 1e76b8c0ec
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/extensions/admin/forms/domain.py
+7 -1
View File
@@ -96,8 +96,14 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm):
if cleaned_data[k] == "":
del cleaned_data[k]
continue
if cleaned_data[k] == name:
self._errors[k] = self.error_class(
[_("A %s with this name already exists") % _("domain")]
)
del cleaned_data[k]
continue
label = check_if_domain_exists(
cleaned_data[k], [(Domain, _('domain'))])
cleaned_data[k], [(Domain, _("domain"))])
if label is not None:
self._errors[k] = self.error_class(
[_("A %s with this name already exists" % unicode(label))]
modoboa/extensions/admin/lib.py
+1 -5
View File
@@ -109,10 +109,6 @@ def check_if_domain_exists(name, extra_checks=None):
if extra_checks is not None:
dtypes = extra_checks + dtypes
for dtype, label in dtypes:
try:
dtype.objects.get(name=name)
except dtype.DoesNotExist:
pass
else:
if dtype.objects.filter(name=name).exists():
return label
return None