Ticket #12972: 12972-2.diff

django/contrib/flatpages/forms.py

@@ -1 +1 @@
 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, ugettext_lazy as _
+
 
 class FlatpageForm(forms.ModelForm):
     url = forms.RegexField(label=_("URL"), max_length=100, regex=r'^[-\w/\.~]+$',
@@ -12 +14 @@
     class Meta:
         model = FlatPage
 
+    def clean_url(self):
+        url = self.cleaned_data['url']
+        if not url.startswith("/"):
+            raise forms.ValidationError(ugettext("Missing leading slash"))
+        if settings.APPEND_SLASH and \
+           'django.middleware.common.CommonMiddleware' in settings.MIDDLEWARE_CLASSES and \
+           not url.endswith("/"):
+            raise forms.ValidationError(ugettext("Missing trailing slash"))
+        return url
+
     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())
+        form = FlatpageForm(data=dict(url='no_leading_slash/', **self.form_data))
+        self.assertFalse(form.is_valid())
+        self.assertEqual(form.errors['url'], ["Missing leading slash"])
+        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())
+            self.assertEqual(form.errors['url'], ["Missing trailing slash"])
 
+    @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 +47 @@
             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