Ticket #12065: django-flatpages-url_clash.patch

django/contrib/flatpages/admin.py

@@ -11 +11 @@
         error_message = _("This value must contain only letters, numbers,"
                           " underscores, dashes or slashes."))
 
+    def clean_sites(self):
+        sites = self.cleaned_data['sites']
+        url = self.cleaned_data['url']
+        errors = []
+        url_clash_query = FlatPage.objects.filter(url=url)
+        if self.instance.pk:
+            url_clash_query = url_clash_query.exclude(pk=self.instance.pk)
+        for site in sites:
+            clashes = url_clash_query.filter(sites=site)
+            for clash in clashes:
+                errors.append(_("There is already a page with the same url for site %s.") % site)
+        if errors:
+            raise forms.ValidationError, errors
+        return sites
+
     class Meta:
         model = FlatPage
 

django/contrib/flatpages/views.py

@@ -1 +1 @@
 from django.contrib.flatpages.models import FlatPage
 from django.template import loader, RequestContext
-from django.shortcuts import get_object_or_404
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.conf import settings
 from django.core.xheaders import populate_xheaders
 from django.utils.safestring import mark_safe
@@ -23 +22 @@
         return HttpResponseRedirect("%s/" % request.path)
     if not url.startswith('/'):
         url = "/" + url
-    f = get_object_or_404(FlatPage, url__exact=url, sites__id__exact=settings.SITE_ID)
+    try:
+        f = FlatPage.objects.filter(url__exact=url, sites__id__exact=settings.SITE_ID)[0]
+    except IndexError:
+        raise Http404
     # If registration is required for accessing this page, and the user isn't
     # logged in, redirect to the login page.
     if f.registration_required and not request.user.is_authenticated():