From 48fc9e23425fab1ccf97b669050c1de359281ba2 Mon Sep 17 00:00:00 2001 From: Joseph Kocherhans Date: Tue, 3 Jul 2007 05:55:20 +0000 Subject: [PATCH] newforms-admin: Fixed #4661 - formset forms can give false errors for add_forms. Resetting the forms is still hackish, but this works for now. git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@5589 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/options.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 5a53b63d59..9eeefcaaa9 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -423,7 +423,7 @@ class ModelAdmin(BaseModelAdmin): for FormSet in self.get_inline_formsets(): inline_formset = FormSet(data=new_data) inline_formsets.append(inline_formset) - if form.is_valid() and all_valid(inline_formsets): + if all_valid(inline_formsets) and form.is_valid(): return self.save_add(request, model, form, inline_formsets, '../%s/') else: form = ModelForm(initial=request.GET) @@ -477,7 +477,7 @@ class ModelAdmin(BaseModelAdmin): inline_formset = FormSet(obj, new_data) inline_formsets.append(inline_formset) - if form.is_valid() and all_valid(inline_formsets): + if all_valid(inline_formsets) and form.is_valid(): return self.save_change(request, model, form, inline_formsets) else: form = ModelForm()