mirror of
https://github.com/django/django.git
synced 2025-07-04 09:49:12 +00:00
newforms-admin: Fixed #5919. The admin add stage with inlines works again.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
42bd0c6eba
commit
e4910ce5b7
@ -494,17 +494,18 @@ class ModelAdmin(BaseModelAdmin):
|
|||||||
|
|
||||||
ModelForm = self.form_add(request)
|
ModelForm = self.form_add(request)
|
||||||
inline_formsets = []
|
inline_formsets = []
|
||||||
|
obj = self.model()
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
form = ModelForm(request.POST, request.FILES)
|
form = ModelForm(request.POST, request.FILES)
|
||||||
for FormSet in self.formsets_add(request):
|
for FormSet in self.formsets_add(request):
|
||||||
inline_formset = FormSet(data=request.POST, files=request.FILES)
|
inline_formset = FormSet(obj, data=request.POST, files=request.FILES)
|
||||||
inline_formsets.append(inline_formset)
|
inline_formsets.append(inline_formset)
|
||||||
if all_valid(inline_formsets) and form.is_valid():
|
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)
|
||||||
for FormSet in self.formsets_add(request):
|
for FormSet in self.formsets_add(request):
|
||||||
inline_formset = FormSet()
|
inline_formset = FormSet(obj)
|
||||||
inline_formsets.append(inline_formset)
|
inline_formsets.append(inline_formset)
|
||||||
|
|
||||||
adminForm = AdminForm(form, list(self.fieldsets_add(request)), self.prepopulated_fields)
|
adminForm = AdminForm(form, list(self.fieldsets_add(request)), self.prepopulated_fields)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user