pedro
/
django-orchestra-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed domain record form validation with SRV records

This commit is contained in:
Marc Aymerich 2016-09-05 12:42:46 +00:00
parent dd9621cc63
commit 020ba1c7c4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
orchestra/contrib/domains/forms.py
View File

@ -7,7 +7,7 @@ from orchestra.admin.forms import AdminFormSet, AdminFormMixin
from . import validators from . import validators
from .helpers import domain_for_validation from .helpers import domain_for_validation
from .models import Domain from .models import Domain, Record
class BatchDomainCreationAdminForm(forms.ModelForm): class BatchDomainCreationAdminForm(forms.ModelForm):
@ -97,6 +97,11 @@ class ValidateZoneMixin(object):
super(ValidateZoneMixin, self).clean() super(ValidateZoneMixin, self).clean()
if any(self.errors): if any(self.errors):
return return
has_srv = False
for form in self.forms:
has_srv = form.cleaned_data.get('type') == Record.SRV
if has_srv:
break
domain_names = [] domain_names = []
if self.instance.name: if self.instance.name:
domain_names.append(self.instance.name) domain_names.append(self.instance.name)
@ -108,7 +113,7 @@ class ValidateZoneMixin(object):
data = form.cleaned_data data = form.cleaned_data
if data and not data['DELETE']: if data and not data['DELETE']:
records.append(data) records.append(data)
if '_' in name: if '_' in name and not has_srv:
errors.append(ValidationError( errors.append(ValidationError(
_("%s: Domains containing underscore character '_' must provide an SRV record.") % name _("%s: Domains containing underscore character '_' must provide an SRV record.") % name
)) ))