From dcea98e07c74de89afaa89f9ec019714daeff043 Mon Sep 17 00:00:00 2001 From: Michael Elkins Date: Sun, 4 Jul 2010 04:41:13 +0000 Subject: fix broken address range splitting svn path=/portal-gui/rpkigui/myrpki/forms.py; revision=3328 --- portal-gui/rpkigui/myrpki/forms.py | 3 +++ portal-gui/rpkigui/myrpki/views.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'portal-gui') diff --git a/portal-gui/rpkigui/myrpki/forms.py b/portal-gui/rpkigui/myrpki/forms.py index d790dfa2..a8318a9e 100644 --- a/portal-gui/rpkigui/myrpki/forms.py +++ b/portal-gui/rpkigui/myrpki/forms.py @@ -179,11 +179,13 @@ def PrefixSplitForm(prefix, *args, **kwargs): lo = self.cleaned_data.get('lo') if lo > prefix.hi: raise forms.ValidationError, 'Value out of range of parent prefix' + return lo def clean_hi(self): hi = self.cleaned_data.get('hi') if hi < prefix.lo: raise forms.ValidationError, 'Value out of range of parent prefix' + return hi def clean(self): hi = self.cleaned_data['hi'] @@ -192,6 +194,7 @@ def PrefixSplitForm(prefix, *args, **kwargs): raise forms.ValidationError, 'Invalid upper range' if prefix.allocated: raise forms.ValidationError, 'Prefix is assigned to child' + return self.cleaned_data return _wrapper(*args, **kwargs) diff --git a/portal-gui/rpkigui/myrpki/views.py b/portal-gui/rpkigui/myrpki/views.py index 0c5b6246..3c190b52 100644 --- a/portal-gui/rpkigui/myrpki/views.py +++ b/portal-gui/rpkigui/myrpki/views.py @@ -444,7 +444,7 @@ def prefix_split_view(request, pk): if request.method == 'POST': form = forms.PrefixSplitForm(prefix, request.POST) if form.is_valid(): - obj = models.AddressRange(form.cleaned_data['lo'], form.cleaned_data['hi'], parent=parent) + obj = models.AddressRange(lo=form.cleaned_data['lo'], hi=form.cleaned_data['hi'], parent=prefix) obj.save() return http.HttpResponseRedirect(obj.get_absolute_url()) else: -- cgit v1.2.3