Ticket #13091: 13091_partial_unique_together.diff

django/forms/models.py

@@ -342 +342 @@
         Calls the instance's validate_unique() method and updates the form's
         validation errors if any were raised.
         """
-        exclude = self._get_validation_exclusions()
         try:
-            self.instance.validate_unique(exclude=exclude)
+            self.instance.validate_unique()
         except ValidationError, e:
             self._update_errors(e.message_dict)
 

tests/regressiontests/admin_views/models.py

@@ -670 +670 @@
     start_date = models.DateTimeField()
     price = models.IntegerField()
     
+class UniqueTogether(models.Model):
+    t1 = models.CharField(max_length=255, blank=True, null=True)
+    t2 = models.CharField(max_length=255, blank=True, null=True)
+    t3 = models.CharField(max_length=255, blank=True, null=True)
+    
+    class Meta:
+        unique_together = ['t1','t2','t3']
+        
+class UniqueTogetherAdmin(admin.ModelAdmin):
+    list_display = ['t3', 't1', 't2']
+    list_editable = ['t1', 't2',]
+    
 admin.site.register(Article, ArticleAdmin)
 admin.site.register(CustomArticle, CustomArticleAdmin)
 admin.site.register(Section, save_as=True, inlines=[ArticleInline])
@@ -706 +718 @@
 admin.site.register(CyclicTwo)
 admin.site.register(WorkHour, WorkHourAdmin)
 admin.site.register(Reservation)
+admin.site.register(UniqueTogether, UniqueTogetherAdmin)
 
 # We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2.
 # That way we cover all four cases:

tests/regressiontests/admin_views/tests.py

@@ -35 +35 @@
     Person, Persona, Picture, Podcast, Section, Subscriber, Vodcast,
     Language, Collector, Widget, Grommet, DooHickey, FancyDoodad, Whatsit,
     Category, Post, Plot, FunkyTag, Chapter, Book, Promo, WorkHour, Employee,
-    Question, Answer, Inquisition, Actor)
+    Question, Answer, Inquisition, Actor, UniqueTogether)
 
 
 class AdminViewBasicTest(TestCase):
@@ -1338 +1338 @@
         # 1 select per object = 3 selects
         self.assertEqual(response.content.count("<select"), 4)
 
+    def test_partial_unique_together(self):
+        """ Ensure that no IntegrityError is raised when editing some (but
+            not all) of the values specified as unique_together. Refs #13091.
+        """
+        UniqueTogether.objects.create(t1='a', t2='b', t3='c')
+        UniqueTogether.objects.create(t1='b', t2='b', t3='a')
+        UniqueTogether.objects.create(t1='c', t2='a', t3='c')
+        data = {
+            "form-TOTAL_FORMS": "3",
+            "form-INITIAL_FORMS": "3",
+            "form-MAX_NUM_FORMS": "0",
+
+            "form-0-t1": "a",
+            "form-0-t2": "b",
+            "form-0-t3": "c",
+            "form-0-id": "1",
+
+            "form-1-t1": "a",
+            "form-1-t2": "b",
+            "form-1-t3": "c",
+            "form-1-id": "2",
+
+            "form-2-t1": "a",
+            "form-2-t2": "b",
+            "form-2-t3": "c",
+            "form-2-id": "3",
+
+            "_save": "Save",
+        }
+        response = self.client.post('/test_admin/admin/admin_views/uniquetogether/', data)
+        self.assertContains(response, 'Please correct the errors below.')
+        
     def test_post_messages(self):
         # Ticket 12707: Saving inline editable should not show admin
         # action warnings