Changeset 9341

Timestamp:

11/05/08 13:47:44 (2 months ago)

Author:

kmtracey

Message:

Fixed #9218 -- Simplified the fix from #9039 and added tests to ensure this case doesn't break again (and that the simplification didn't break anything).

Files:

• django/trunk/django/forms/models.py (modified) (2 diffs)
• django/trunk/tests/modeltests/model_forms/models.py (modified) (2 diffs)

django/trunk/django/forms/models.py

@@ -235 +235 @@
-        unique_checks = []
-        for check in self.instance._meta.unique_together[:]:
-field in self.cleaned_data and not self.cleaned_data[field] is
+self.cleaned_data.get(field) is not
-            if len(fields_on_form) == len(check):
-                unique_checks.append(check)
@@ -249 +249 @@
-                # This is an extra field that's not on the ModelForm, ignore it
-                continue
-name in self.cleaned_data and not self.cleaned_data[name] is
+self.cleaned_data.get(name) is not
-                unique_checks.append((name,))
-

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

@@ -159 +159 @@
-    class Meta:
-        unique_together = ('title', 'author')
+        
+class ExplicitPK(models.Model):
+    key = models.CharField(max_length=20, primary_key=True)
+    desc = models.CharField(max_length=20, blank=True, unique=True)
+    class Meta:
+        unique_together = ('key', 'desc')
+    
+    def __unicode__(self):
+        return self.key
-
-__test__ = {'API_TESTS': """
@@ -1248 +1257 @@
-True
-
+# Test for primary_key being in the form and failing validation.
+>>> class ExplicitPKForm(ModelForm):
+...     class Meta:
+...         model = ExplicitPK
+...         fields = ('key', 'desc',)
+>>> form = ExplicitPKForm({'key': u'', 'desc': u'' })
+>>> form.is_valid()
+False
+
+# Ensure keys and blank character strings are tested for uniqueness.
+>>> form = ExplicitPKForm({'key': u'key1', 'desc': u''})
+>>> form.is_valid()
+True
+>>> form.save()
+<ExplicitPK: key1>
+>>> form = ExplicitPKForm({'key': u'key1', 'desc': u''})
+>>> form.is_valid()
+False
+>>> form.errors
+{'__all__': [u'Explicit pk with this Key and Desc already exists.'], 'key': [u'Explicit pk with this Key already exists.'], 'desc': [u'Explicit pk with this Desc already exists.']}
+
-# Choices on CharField and IntegerField
->>> class ArticleForm(ModelForm):