Changeset 9297

Timestamp:

10/31/08 17:07:05 (2 months ago)

Author:

brosner

Message:

Fixed #8882 -- When a foreign key is among the unique_together fields in an inline formset properly handle it.

Files:

• django/trunk/django/contrib/admin/helpers.py (modified) (4 diffs)
• django/trunk/django/contrib/admin/templates/admin/edit_inline/stacked.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin/edit_inline/tabular.html (modified) (1 diff)
• django/trunk/django/forms/models.py (modified) (5 diffs)
• django/trunk/tests/modeltests/model_formsets/models.py (modified) (11 diffs)

django/trunk/django/contrib/admin/helpers.py

@@ -110 +110 @@
-    def fields(self):
-        for field_name in flatten_fieldsets(self.fieldsets):
+            if self.formset.fk.name == field_name:
+                continue
-            yield self.formset.form.base_fields[field_name]
-
@@ -131 +133 @@
-        super(InlineAdminForm, self).__init__(form, fieldsets, prepopulated_fields)
-    
+    def __iter__(self):
+        for name, options in self.fieldsets:
+            yield InlineFieldset(self.formset, self.form, name, **options)
+    
-    def field_count(self):
-        # tabular.html uses this function for colspan value.
@@ -143 +149 @@
-    def pk_field(self):
-        return AdminField(self.form, self.formset._pk_field.name, False)
+    
+    def fk_field(self):
+        return AdminField(self.form, self.formset.fk.name, False)
-
-    def deletion_field(self):
@@ -152 +161 @@
-        return AdminField(self.form, ORDERING_FIELD_NAME, False)
-
+class InlineFieldset(Fieldset):
+    def __init__(self, formset, *args, **kwargs):
+        self.formset = formset
+        super(InlineFieldset, self).__init__(*args, **kwargs)
+        
+    def __iter__(self):
+        for field in self.fields:
+            if self.formset.fk.name == field:
+                continue
+            yield Fieldline(self.form, field)
+            
-class AdminErrorList(forms.util.ErrorList):
-    """

django/trunk/django/contrib/admin/templates/admin/edit_inline/stacked.html

@@ -19 +19 @@
-  {% endfor %}
-  {{ inline_admin_form.pk_field.field }}
+  {{ inline_admin_form.fk_field.field }}
-</div>
-{% endfor %}

django/trunk/django/contrib/admin/templates/admin/edit_inline/tabular.html

@@ -27 +27 @@
-          {% if inline_admin_form.show_url %}<a href="../../../r/{{ inline_admin_form.original.content_type_id }}/{{ inline_admin_form.original.id }}/">{% trans "View on site" %}</a>{% endif %}
-            </p>{% endif %}
-
+ {{ inline_admin_form.fk_field.field }}
-          {% spaceless %}
-          {% for fieldset in inline_admin_form %}

django/trunk/django/forms/models.py

@@ -4 +4 @@
-"""
-
-
+, force_unicode
-from django.utils.datastructures import SortedDict
-from django.utils.text import get_text_list, capfirst
@@ -469 +469 @@
-            form.data[form.add_prefix(self._pk_field.name)] = None
-        return form
-
+
-    def get_queryset(self):
-        """
@@ -486 +486 @@
-        super(BaseInlineFormSet, self).add_fields(form, index)
-        if self._pk_field == self.fk:
-
+
+
+
-
-def _get_foreign_key(parent_model, model, fk_name=None):
@@ -538 +540 @@
-    if fk.unique:
-        max_num = 1
-    if exclude is not None:
-        exclude = list(exclude)
-        exclude.append(fk.name)
-    else:
-        exclude = [fk.name]
-    kwargs = {
-        'form': form,
@@ -560 +557 @@
-
-# Fields #####################################################################
+
+class InlineForeignKeyHiddenInput(HiddenInput):
+    def _has_changed(self, initial, data):
+        return False
+
+class InlineForeignKeyField(Field):
+    """
+    A basic integer field that deals with validating the given value to a
+    given parent instance in an inline.
+    """
+    default_error_messages = {
+        'invalid_choice': _(u'The inline foreign key did not match the parent instance primary key.'),
+    }
+    
+    def __init__(self, parent_instance, *args, **kwargs):
+        self.parent_instance = parent_instance
+        self.pk_field = kwargs.pop("pk_field", False)
+        if self.parent_instance is not None:
+            kwargs["initial"] = self.parent_instance.pk
+        kwargs["required"] = False
+        kwargs["widget"] = InlineForeignKeyHiddenInput
+        super(InlineForeignKeyField, self).__init__(*args, **kwargs)
+    
+    def clean(self, value):
+        if value in EMPTY_VALUES:
+            if self.pk_field:
+                return None
+            # if there is no value act as we did before.
+            return self.parent_instance
+        # ensure the we compare the values as equal types.
+        if force_unicode(value) != force_unicode(self.parent_instance.pk):
+            raise ValidationError(self.error_messages['invalid_choice'])
+        if self.pk_field:
+            return self.parent_instance.pk
+        return self.parent_instance
-
-class ModelChoiceIterator(object):

django/trunk/tests/modeltests/model_formsets/models.py

@@ -96 +96 @@
-class MexicanRestaurant(Restaurant):
-    serves_tacos = models.BooleanField()
+
+# models for testing unique_together validation when a fk is involved and
+# using inlineformset_factory.
+class Repository(models.Model):
+    name = models.CharField(max_length=25)
+    
+    def __unicode__(self):
+        return self.name
+
+class Revision(models.Model):
+    repository = models.ForeignKey(Repository)
+    revision = models.CharField(max_length=40)
+    
+    class Meta:
+        unique_together = (("repository", "revision"),)
+    
+    def __unicode__(self):
+        return u"%s (%s)" % (self.revision, unicode(self.repository))
-
-# models for testing callable defaults (see bug #7975). If you define a model
@@ -376 +394 @@
->>> for form in formset.forms:
-...     print form.as_p()
-
-
-
+author" value="1" id="id_book_set-0-author" /><input type="hidden" name="book_set-0-
+author" value="1" id="id_book_set-1-author" /><input type="hidden" name="book_set-1-
+author" value="1" id="id_book_set-2-author" /><input type="hidden" name="book_set-2-
-
->>> data = {
@@ -410 +428 @@
->>> for form in formset.forms:
-...     print form.as_p()
-
-
-
+author" value="1" id="id_book_set-0-author" /><input type="hidden" name="book_set-0-
+author" value="1" id="id_book_set-1-author" /><input type="hidden" name="book_set-1-
+author" value="1" id="id_book_set-2-author" /><input type="hidden" name="book_set-2-
-
->>> data = {
@@ -455 +473 @@
-
->>> new_author = Author.objects.create(name='Charles Baudelaire')
-.instance = new_author
+ = AuthorBooksFormSet(data, instance=new_author, save_as_new=True)
->>> [book for book in formset.save() if book.author.pk == new_author.pk]
-[<Book: Les Fleurs du Mal>, <Book: Le Spleen de Paris>]
@@ -464 +482 @@
->>> for form in formset.forms:
-...     print form.as_p()
-
-
+author" id="id_test-0-author" /><input type="hidden" name="test-0-
+author" id="id_test-1-author" /><input type="hidden" name="test-1-
-
-# Test a custom primary key ###################################################
@@ -487 +505 @@
->>> for form in formset.forms:
-...     print form.as_p()
-
-
+place" value="1" id="id_owner_set-0-place" /><input type="hidden" name="owner_set-0-
+place" value="1" id="id_owner_set-1-place" /><input type="hidden" name="owner_set-1-
-
->>> data = {
@@ -507 +525 @@
->>> for form in formset.forms:
-...     print form.as_p()
-
-
-
+place" value="1" id="id_owner_set-0-place" /><input type="hidden" name="owner_set-0-
+place" value="1" id="id_owner_set-1-place" /><input type="hidden" name="owner_set-1-
+place" value="1" id="id_owner_set-2-place" /><input type="hidden" name="owner_set-2-
-
->>> data = {
@@ -546 +564 @@
->>> for form in formset.forms:
-...     print form.as_p()
-
+value="1" 
-
->>> data = {
@@ -584 +602 @@
-...     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>
-
+place" value="1" id="id_location_set-0-place" /><input type="hidden" name="location_set-0-
-
-# Foreign keys in parents ########################################
@@ -647 +665 @@
-[{'__all__': [u'Price with this Price and Quantity already exists.']}]
-
+# unique_together with inlineformset_factory
+# Also see bug #8882.
+
+>>> repository = Repository.objects.create(name=u'Test Repo')
+>>> FormSet = inlineformset_factory(Repository, Revision, extra=1)
+>>> data = {
+...     'revision_set-TOTAL_FORMS': '1',
+...     'revision_set-INITIAL_FORMS': '0',
+...     'revision_set-0-repository': repository.pk,
+...     'revision_set-0-revision': '146239817507f148d448db38840db7c3cbf47c76',
+...     'revision_set-0-DELETE': '',
+... }
+>>> formset = FormSet(data, instance=repository)
+>>> formset.is_valid()
+True
+>>> formset.save()
+[<Revision: 146239817507f148d448db38840db7c3cbf47c76 (Test Repo)>]
+
+# attempt to save the same revision against against the same repo.
+>>> data = {
+...     'revision_set-TOTAL_FORMS': '1',
+...     'revision_set-INITIAL_FORMS': '0',
+...     'revision_set-0-repository': repository.pk,
+...     'revision_set-0-revision': '146239817507f148d448db38840db7c3cbf47c76',
+...     'revision_set-0-DELETE': '',
+... }
+>>> formset = FormSet(data, instance=repository)
+>>> formset.is_valid()
+False
+>>> formset.errors
+[{'__all__': [u'Revision with this Repository and Revision already exists.']}]
+
-# Use of callable defaults (see bug #7975).
-
@@ -661 +711 @@
->>> print form.as_p()
-<p><label for="id_membership_set-0-date_joined">Date joined:</label> <input type="text" name="membership_set-0-date_joined" value="..." id="id_membership_set-0-date_joined" /><input type="hidden" name="initial-membership_set-0-date_joined" value="..." id="id_membership_set-0-date_joined" /></p>
-
+person" value="1" id="id_membership_set-0-person" /><input type="hidden" name="membership_set-0-
-
-# test for validation with callable defaults. Validations rely on hidden fields