Added checks for 'slug' key in cleaned_data to avoid errors during pa…

…ge validation
yakky · Oct 18, 2012 · 85b5567 · 85b5567
1 parent 1851361
commit 85b5567
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/cms/admin/forms.py b/cms/admin/forms.py
@@ -92,7 +92,7 @@ def __init__(self, *args, **kwargs):
 
     def clean(self):
         cleaned_data = self.cleaned_data
-        if 'slug' in cleaned_data.keys():
+        if 'slug' in cleaned_data:
             slug = cleaned_data['slug']
         else:
             slug = ""
@@ -121,17 +121,18 @@ def clean(self):
             #AdminFormsTests.test_clean_overwrite_url validates the form with when no page instance available
             #Looks like just a theoretical corner case
             title = page.get_title_obj(lang)
-            if title:
+            if title and slug:
                 oldslug = title.slug
-                title.slug = self.cleaned_data['slug']
+                title.slug = slug
                 title.save()
                 try:
                     is_valid_url(title.path,page)
                 except ValidationError,e:
                     title.slug = oldslug
                     title.save()
-                    del cleaned_data['published']
-                    self._errors['published'] = ErrorList(e.messages)
+                    if 'slug' in cleaned_data:
+                        del cleaned_data['slug']
+                    self._errors['slug'] = ErrorList(e.messages)
         return cleaned_data
 
     def clean_slug(self):