Ticket #12972: flatpages_admin_trunk.diff

django/contrib/flatpages/admin.py

@@ -3 +3 @@
 from django.contrib.flatpages.models import FlatPage
 from django.utils.translation import ugettext_lazy as _
 
+from django.conf import settings
 
+URL_REGEX = r'^/[-\w/]+$'
+if settings.APPEND_SLASH and 'django.middleware.common.CommonMiddleware' in settings.MIDDLEWARE_CLASSES:
+    URL_REGEX = r'^/[-\w/]+/$'
+
 class FlatpageForm(forms.ModelForm):
-    url = forms.RegexField(label=_("URL"), max_length=100, regex=r'^[-\w/]+$',
+    url = forms.RegexField(label=_("URL"), max_length=100, regex=URL_REGEX,
         help_text = _("Example: '/about/contact/'. Make sure to have leading"
                       " and trailing slashes."),
         error_message = _("This value must contain only letters, numbers,"

tests/regressiontests/flatpage_tests/tests.py

@@ +1 @@
+# -*- coding: utf-8 -*-
+from django.test import TestCase
+from django.core.exceptions import ValidationError
+from django.contrib.flatpages.admin import FlatpageForm
+
+urltest = FlatpageForm.base_fields['url'].clean
+
+class FlatpageTests(TestCase):
+
+    def testURLValidation(self):
+        PASS = ('/some/page/', '/about/', 
+                '/cheese/shoppe/comments/')
+        FAIL = ('white space', 'bad&char', '/trailing/slash',
+                'leading/slash/', 'noslashes')
+        for url in PASS:
+            self.assertEquals(urltest(url), url)
+        for url in FAIL:
+            self.assertRaises(ValidationError, urltest, url)
+