From 93da6a1c41b0cff2d1a6af7640d2e64948996e7c Mon Sep 17 00:00:00 2001 From: Sebastian Lohff Date: Tue, 4 Apr 2017 02:53:25 +0200 Subject: [PATCH] Domain display fixes --- domains/forms.py | 10 ++++++++-- templates/domains/overview.html | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/domains/forms.py b/domains/forms.py index 0245adf..8c37daf 100644 --- a/domains/forms.py +++ b/domains/forms.py @@ -75,6 +75,10 @@ class NameserverForm(MntFormMixin, WhoisObjectFormMixin, forms.ModelForm): if not name.endswith("."): name += "." + # allow name to stay if it did not change + if not self._create and self.instance.name == name: + return name + if name.count(".") <= 2: raise forms.ValidationError("Nameserver must be inside a domain (e.g. ns1.noot.dn.)") @@ -138,6 +142,10 @@ class ReverseZoneForm(forms.ModelForm): model = ReverseZone fields = ['parentNet', 'nameservers'] + help_texts = { + "prefix": "The prefix in CIDR form for which this object is responsible", + } + def __init__(self, user, *args, **kwargs): self._user = user @@ -157,8 +165,6 @@ class ReverseZoneForm(forms.ModelForm): self.fields['nameservers'].queryset.distinct() - - def clean(self): cleaned_data = super(ReverseZoneForm, self).clean() diff --git a/templates/domains/overview.html b/templates/domains/overview.html index d7a7623..5b0b9b1 100644 --- a/templates/domains/overview.html +++ b/templates/domains/overview.html @@ -72,10 +72,10 @@ {% for reversezone in reversezones %} {{ reversezone.prefix }} - + {{ reversezone.parentNet|linkObject }}