mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-07 19:29:12 +00:00
Code Issues 32 Releases Wiki Activity

[soc2009/model-validation] Save object before validating it's edit inlines when creating an object

Browse Source 
in the admin interface

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@10870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Honza Král 2009-06-01 15:39:21 +00:00
parent 6152164303
commit 2f0e6d5595
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
django/contrib/admin/options.py
View File

@ -543,12 +543,12 @@ class ModelAdmin(BaseModelAdmin):
""" """
request.user.message_set.create(message=message) request.user.message_set.create(message=message)
def save_form(self, request, form, change): def save_form(self, request, form, change, commit=False):
""" """
Given a ModelForm return an unsaved instance. ``change`` is True if Given a ModelForm return an unsaved instance. ``change`` is True if
the object is being changed, and False if it's being added. the object is being changed, and False if it's being added.
""" """
return form.save(commit=False) return form.save(commit=commit)
def save_model(self, request, obj, form, change): def save_model(self, request, obj, form, change):
""" """
@ -714,7 +714,10 @@ class ModelAdmin(BaseModelAdmin):
form = ModelForm(request.POST, request.FILES) form = ModelForm(request.POST, request.FILES)
if form.is_valid(): if form.is_valid():
form_validated = True form_validated = True
new_object = self.save_form(request, form, change=False) # save the object, even if inline formsets haven't been validated yet
# We need to pass the valid model to the formsets for validation. If
# the formsets do not validate, we will delete the object.
new_object = self.save_form(request, form, change=False, commit=True)
else: else:
form_validated = False form_validated = False
new_object = self.model() new_object = self.model()
@ -730,13 +733,14 @@ class ModelAdmin(BaseModelAdmin):
prefix=prefix) prefix=prefix)
formsets.append(formset) formsets.append(formset)
if all_valid(formsets) and form_validated: if all_valid(formsets) and form_validated:
self.save_model(request, new_object, form, change=False)
form.save_m2m()
for formset in formsets: for formset in formsets:
self.save_formset(request, form, formset, change=False) self.save_formset(request, form, formset, change=False)
self.log_addition(request, new_object) self.log_addition(request, new_object)
return self.response_add(request, new_object) return self.response_add(request, new_object)
elif form_validated:
# delete the saved object
new_object.delete()
else: else:
# Prepare the dict of initial data from the request. # Prepare the dict of initial data from the request.
# We have to special-case M2Ms as a list of comma-separated PKs. # We have to special-case M2Ms as a list of comma-separated PKs.