mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-22 17:16:24 +00:00
Code Issues 25 Releases Wiki Activity

Fixed #29746 -- Fixed misleading FlatpageForm URL help text if APPEND_SLASH is disabled.

Browse Source
This commit is contained in:
Tom Carrick 2018-09-09 12:35:44 +01:00 committed by Tim Graham
parent 5195b99e2c
commit a43cfc23d4
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
django/contrib/flatpages/forms.py
View File

@ -22,6 +22,19 @@ class FlatpageForm(forms.ModelForm):
model = FlatPage
fields = '__all__'
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
if not self._trailing_slash_required():
self.fields['url'].help_text = _(
"Example: '/about/contact'. Make sure to have a leading slash."
)
def _trailing_slash_required(self):
return (
settings.APPEND_SLASH and
'django.middleware.common.CommonMiddleware' in settings.MIDDLEWARE
)
def clean_url(self):
url = self.cleaned_data['url']
if not url.startswith('/'):
@ -29,9 +42,7 @@ class FlatpageForm(forms.ModelForm):
gettext("URL is missing a leading slash."),
code='missing_leading_slash',
)
if (settings.APPEND_SLASH and
'django.middleware.common.CommonMiddleware' in settings.MIDDLEWARE and
not url.endswith('/')):
if self._trailing_slash_required() and not url.endswith('/'):
raise forms.ValidationError(
gettext("URL is missing a trailing slash."),
code='missing_trailing_slash',

10
tests/flatpages_tests/test_forms.py
View File

@ -49,6 +49,11 @@ class FlatpageAdminFormTests(TestCase):
def test_flatpage_requires_trailing_slash_with_append_slash(self):
form = FlatpageForm(data=dict(url='/no_trailing_slash', **self.form_data))
with translation.override('en'):
self.assertEqual(
form.fields['url'].help_text,
"Example: '/about/contact/'. Make sure to have leading and "
"trailing slashes."
)
self.assertFalse(form.is_valid())
self.assertEqual(form.errors['url'], ["URL is missing a trailing slash."])
@ -56,6 +61,11 @@ class FlatpageAdminFormTests(TestCase):
def test_flatpage_doesnt_requires_trailing_slash_without_append_slash(self):
form = FlatpageForm(data=dict(url='/no_trailing_slash', **self.form_data))
self.assertTrue(form.is_valid())
with translation.override('en'):
self.assertEqual(
form.fields['url'].help_text,
"Example: '/about/contact'. Make sure to have a leading slash."
)
def test_flatpage_admin_form_url_uniqueness_validation(self):
"The flatpage admin form correctly enforces url uniqueness among flatpages of the same site"