Ticket #14678: 14678.diff

django/contrib/flatpages/tests/forms.py

@@ -1 +1 @@
 from django.conf import settings
 from django.contrib.flatpages.admin import FlatpageForm
+from django.contrib.flatpages.models import FlatPage
+from django.contrib.sites.models import Site
 from django.test import TestCase
+from django.db.utils import IntegrityError
 
 class FlatpageAdminFormTests(TestCase):
     def setUp(self):
@@ -11 +14 @@
         }
 
     def test_flatpage_admin_form_url_validation(self):
-        "The flatpage admin form validates correctly validates urls"
+        "The flatpage admin form correctly validates urls"
         self.assertTrue(FlatpageForm(data=dict(url='/new_flatpage/', **self.form_data)).is_valid())
         self.assertTrue(FlatpageForm(data=dict(url='/some.special~chars/', **self.form_data)).is_valid())
         self.assertTrue(FlatpageForm(data=dict(url='/some.very_special~chars-here/', **self.form_data)).is_valid())
@@ -21 +24 @@
         self.assertFalse(FlatpageForm(data=dict(url='/a ! char/', **self.form_data)).is_valid())
         self.assertFalse(FlatpageForm(data=dict(url='/a & char/', **self.form_data)).is_valid())
         self.assertFalse(FlatpageForm(data=dict(url='/a ? char/', **self.form_data)).is_valid())
+
+    def test_url_must_be_unique_for_all_pages_in_the_same_site(self):
+        "The flatpage admin form correctly enforces url uniqueness among all flatpages belonging to the same site"
+        flat_page = FlatPage.objects.create(url='/flatpages/mypage/', title='My Page', content='My Page')
+        flat_page.sites.add(1)
+        flat_page.save()
+        
+        duplicate = FlatPage.objects.create(url='/flatpages/mypage/', title='Duplicate', content='Duplicate')
+        self.assertRaises(IntegrityError, duplicate.sites.add, 1)

django/contrib/flatpages/models.py

@@ -1 +1 @@
 from django.db import models
 from django.contrib.sites.models import Site
 from django.utils.translation import ugettext_lazy as _
+from django.db.models.signals import m2m_changed
+from django.dispatch import receiver
+from django.db.utils import IntegrityError
 
 
 class FlatPage(models.Model):
@@ -24 +27 @@
 
     def get_absolute_url(self):
         return self.url
+
+@receiver(m2m_changed, sender=FlatPage.sites.through)
+def verify_flatpage_uniqueness(sender, **kwargs):
+    flat_page = kwargs.get('instance', None)
+    action = kwargs.get('action', None)
+    sites = kwargs.get('pk_set', None)
+
+    if action == 'pre_add':
+        for site in sites:
+            if FlatPage.objects.filter(url=flat_page.url).filter(sites=site):
+                raise IntegrityError('Flatpage with url %s already exists for site %s' % (flat_page.url, Site.objects.get(pk=site)))