test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #18234: Avoided exception on flatpage add

This commit is contained in:
Karen Tracey 2012-04-28 19:44:14 -04:00
parent c2055ee161
commit 75743c189d
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ class FlatpageForm(forms.ModelForm):
if self.instance.pk: if self.instance.pk:
same_url = same_url.exclude(pk=self.instance.pk) same_url = same_url.exclude(pk=self.instance.pk)
if same_url.filter(sites__in=sites).exists(): if sites and same_url.filter(sites__in=sites).exists():
for site in sites: for site in sites:
if same_url.filter(sites=site).exists(): if same_url.filter(sites=site).exists():
raise forms.ValidationError( raise forms.ValidationError(

13
django/contrib/flatpages/tests/forms.py
View File

@ -78,3 +78,16 @@ class FlatpageAdminFormTests(TestCase):
updated = f.save() updated = f.save()
self.assertEqual(updated.title, "A test page") self.assertEqual(updated.title, "A test page")
def test_flatpage_nosites(self):
data = dict(url='/myflatpage1/', **self.form_data)
data.update({'sites': ''})
f = FlatpageForm(data=data)
self.assertFalse(f.is_valid())
self.assertEqual(
f.errors,
{'sites': [u'This field is required.']})