mirror of
https://github.com/django/django.git
synced 2025-07-04 09:49:12 +00:00
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
This commit is contained in:
parent
7c10d69527
commit
48fc9e2342
@ -423,7 +423,7 @@ class ModelAdmin(BaseModelAdmin):
|
|||||||
for FormSet in self.get_inline_formsets():
|
for FormSet in self.get_inline_formsets():
|
||||||
inline_formset = FormSet(data=new_data)
|
inline_formset = FormSet(data=new_data)
|
||||||
inline_formsets.append(inline_formset)
|
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/')
|
return self.save_add(request, model, form, inline_formsets, '../%s/')
|
||||||
else:
|
else:
|
||||||
form = ModelForm(initial=request.GET)
|
form = ModelForm(initial=request.GET)
|
||||||
@ -477,7 +477,7 @@ class ModelAdmin(BaseModelAdmin):
|
|||||||
inline_formset = FormSet(obj, new_data)
|
inline_formset = FormSet(obj, new_data)
|
||||||
inline_formsets.append(inline_formset)
|
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)
|
return self.save_change(request, model, form, inline_formsets)
|
||||||
else:
|
else:
|
||||||
form = ModelForm()
|
form = ModelForm()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user