Ticket #12972: 12972.diff

django/contrib/flatpages/forms.py

@@ +1 @@
+import re
+
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.conf import settings
 from django.contrib.flatpages.models import FlatPage
+from django.utils.translation import ugettext_lazy as _
+
+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,"
@@ -12 +17 @@
     class Meta:
         model = FlatPage
 
+    def __init__(self, *args, **kwargs):
+        super(FlatpageForm, self).__init__(*args, **kwargs)
+        if not settings.APPEND_SLASH or \
+           not 'django.middleware.common.CommonMiddleware' in settings.MIDDLEWARE_CLASSES:
+            # Make trailing slash optional
+            self.fields['url'].regex = re.compile(r'%s$' % URL_REGEX[:-2])
+
     def clean(self):
         url = self.cleaned_data.get('url', None)
         sites = self.cleaned_data.get('sites', None)

django/contrib/flatpages/tests/forms.py

@@ -2 +2 @@
 from django.contrib.flatpages.forms import FlatpageForm
 from django.contrib.flatpages.models import FlatPage
 from django.test import TestCase
+from django.test.utils import override_settings
 
 class FlatpageAdminFormTests(TestCase):
     def setUp(self):
@@ -22 +23 @@
         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())
+        self.assertFalse(FlatpageForm(data=dict(url='no_leading_slash/', **self.form_data)).is_valid())
+        if settings.APPEND_SLASH and \
+           'django.middleware.common.CommonMiddleware' in settings.MIDDLEWARE_CLASSES:
+            form = FlatpageForm(data=dict(url='/no_trailing_slash', **self.form_data))
+            self.assertFalse(form.is_valid())
 
-    def test_flatpage_admin_form_url_uniqueness_validation(self):
+    @override_settings(APPEND_SLASH=False)
+    def _test_flatpage_admin_form_url_uniqueness_validation(self):
         "The flatpage admin form correctly enforces url uniqueness among flatpages of the same site"
         data = dict(url='/myflatpage1', **self.form_data)
 
@@ -37 +44 @@
             f.errors,
             {'__all__': [u'Flatpage with url /myflatpage1 already exists for site example.com']})
 
+    @override_settings(APPEND_SLASH=False)
     def test_flatpage_admin_form_edit(self):
         """
         Existing flatpages can be edited in the admin form without triggering