mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 07:06:08 +00:00
Code Issues 32 Releases Wiki Activity

Enforce max_num=1 on inline model formsets that have a unique foreign key to its parent. I snuck in a quick clean up to the inlineformset_factory as well.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Brian Rosner
2008-08-31 21:14:46 +00:00
parent 4f5b0a321d
commit d511996901
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
django/forms/models.py
View File

@@ -424,17 +424,25 @@ def inlineformset_factory(parent_model, model, form=ModelForm,
to ``parent_model``. to ``parent_model``.
""" """
fk = _get_foreign_key(parent_model, model, fk_name=fk_name) fk = _get_foreign_key(parent_model, model, fk_name=fk_name)
# let the formset handle object deletion by default # enforce a max_num=1 when the foreign key to the parent model is unique.
if fk.unique:
max_num = 1
if exclude is not None: if exclude is not None:
exclude.append(fk.name) exclude.append(fk.name)
else: else:
exclude = [fk.name] exclude = [fk.name]
FormSet = modelformset_factory(model, form=form, kwargs = {
formfield_callback=formfield_callback, 'form': form,
formset=formset, 'formfield_callback': formfield_callback,
extra=extra, can_delete=can_delete, can_order=can_order, 'formset': formset,
fields=fields, exclude=exclude, max_num=max_num) 'extra': extra,
'can_delete': can_delete,
'can_order': can_order,
'fields': fields,
'exclude': exclude,
'max_num': max_num,
}
FormSet = modelformset_factory(model, **kwargs)
FormSet.fk = fk FormSet.fk = fk
return FormSet return FormSet

15
tests/modeltests/model_formsets/models.py
View File

@@ -54,6 +54,12 @@ class Owner(models.Model):
def __unicode__(self): def __unicode__(self):
return "%s at %s" % (self.name, self.place) return "%s at %s" % (self.name, self.place)
class Location(models.Model):
place = models.ForeignKey(Place, unique=True)
# this is purely for testing the data doesn't matter here :)
lat = models.CharField(max_length=100)
lon = models.CharField(max_length=100)
class OwnerProfile(models.Model): class OwnerProfile(models.Model):
owner = models.OneToOneField(Owner, primary_key=True) owner = models.OneToOneField(Owner, primary_key=True)
age = models.PositiveIntegerField() age = models.PositiveIntegerField()
@@ -529,6 +535,15 @@ True
>>> formset.save() >>> formset.save()
[<OwnerProfile: Joe Perry is 55>] [<OwnerProfile: Joe Perry is 55>]
# ForeignKey with unique=True should enforce max_num=1
>>> FormSet = inlineformset_factory(Place, Location, can_delete=False)
>>> formset = FormSet(instance=place)
>>> for form in formset.forms:
... print form.as_p()
<p><label for="id_location_set-0-lat">Lat:</label> <input id="id_location_set-0-lat" type="text" name="location_set-0-lat" maxlength="100" /></p>
<p><label for="id_location_set-0-lon">Lon:</label> <input id="id_location_set-0-lon" type="text" name="location_set-0-lon" maxlength="100" /><input type="hidden" name="location_set-0-id" id="id_location_set-0-id" /></p>
# Foreign keys in parents ######################################## # Foreign keys in parents ########################################
>>> from django.forms.models import _get_foreign_key >>> from django.forms.models import _get_foreign_key