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

[soc2009/model-validation] Combined save_made_instance and save_instnace for simplicity.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@12090 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Joseph Kocherhans 2010-01-04 23:34:54 +00:00
parent a54ed5ad1e
commit 82c4f9d04e
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
django/forms/models.py
View File

@ -29,7 +29,12 @@ __all__ = (
'ModelMultipleChoiceField', 'ModelMultipleChoiceField',
) )
def make_instance(form, instance, fields=None, exclude=None): def construct_instance(form, instance, fields=None, exclude=None):
"""
Constructs and returns a model instance from the bound ``form``'s
``cleaned_data``, but does not save the returned instance to the
database.
"""
from django.db import models from django.db import models
opts = instance._meta opts = instance._meta
@ -59,7 +64,19 @@ def make_instance(form, instance, fields=None, exclude=None):
return instance return instance
def save_made_instance(form, instance, fields=None, commit=True, fail_message='saved'): def save_instance(form, instance, fields=None, fail_message='saved',
commit=True, exclude=None, construct=True):
"""
Saves bound Form ``form``'s cleaned_data into model instance ``instance``.
If commit=True, then the changes to ``instance`` will be saved to the
database. Returns ``instance``.
If construct=False, assume ``instance`` has already been constructed and
just needs to be saved.
"""
if construct:
instance = construct_instance(form, instance, fields, exclude)
opts = instance._meta opts = instance._meta
if form.errors: if form.errors:
raise ValueError("The %s could not be %s because the data didn't" raise ValueError("The %s could not be %s because the data didn't"
@ -83,18 +100,6 @@ def save_made_instance(form, instance, fields=None, commit=True, fail_message='s
form.save_m2m = save_m2m form.save_m2m = save_m2m
return instance return instance
def save_instance(form, instance, fields=None, fail_message='saved',
commit=True, exclude=None):
"""
Saves bound Form ``form``'s cleaned_data into model instance ``instance``.
If commit=True, then the changes to ``instance`` will be saved to the
database. Returns ``instance``.
"""
instance = make_instance(form, instance, fields, exclude)
return save_made_instance(form, instance, fields, commit, fail_message)
def make_model_save(model, fields, fail_message): def make_model_save(model, fields, fail_message):
"""Returns the save() method for a Form.""" """Returns the save() method for a Form."""
def save(self, commit=True): def save(self, commit=True):
@ -242,7 +247,7 @@ class BaseModelForm(BaseForm):
def clean(self): def clean(self):
opts = self._meta opts = self._meta
self.instance = make_instance(self, self.instance, opts.fields, opts.exclude) self.instance = construct_instance(self, self.instance, opts.fields, opts.exclude)
try: try:
self.instance.full_validate(exclude=self._errors.keys()) self.instance.full_validate(exclude=self._errors.keys())
except ValidationError, e: except ValidationError, e:
@ -276,7 +281,8 @@ class BaseModelForm(BaseForm):
fail_message = 'created' fail_message = 'created'
else: else:
fail_message = 'changed' fail_message = 'changed'
return save_made_instance(self, self.instance, self._meta.fields, commit, fail_message) return save_instance(self, self.instance, self._meta.fields,
fail_message, commit, construct=False)
save.alters_data = True save.alters_data = True