Fixed #6130 -- Set overwrite_url initial value on advanced settings form (#6132)

czpython · web-flow · commit acfa6889df93 · 2017-11-15T13:33:46.000-05:00
diff --git a/cms/admin/forms.py b/cms/admin/forms.py
@@ -604,6 +604,9 @@ def __init__(self, *args, **kwargs):
             self.fields['redirect'].widget.language = self._language
             self.fields['redirect'].initial = self.title_obj.redirect
 
+        if 'overwrite_url' in self.fields:
+            self.fields['overwrite_url'].initial = self.title_obj.path
+
     def get_navigation_extenders(self):
         return menu_pool.get_menus_by_attribute("cms_enabled", True)
 
diff --git a/cms/tests/test_page_admin.py b/cms/tests/test_page_admin.py
@@ -828,7 +828,30 @@ def test_get_page_from_request_cached(self):
         self.assertEqual(page, mock_page)
 
     @override_settings(CMS_PERMISSION=False)
-    def test_existing_overwrite_url(self):
+    def test_set_overwrite_url(self):
+        superuser = self.get_superuser()
+        cms_page = create_page('page', 'nav_playground.html', 'en', published=True)
+        expected = (
+            '<input id="id_overwrite_url" maxlength="255" '
+            'value="new-url" name="overwrite_url" type="text" />'
+        )
+        changelist = self.get_admin_url(Page, 'changelist')
+        endpoint = self.get_admin_url(Page, 'advanced', cms_page.pk)
+
+        with self.login_user_context(superuser):
+            page_data = {
+                'overwrite_url': '/new-url/',
+                'template': cms_page.template,
+            }
+            response = self.client.post(endpoint, page_data)
+            self.assertRedirects(response, changelist)
+
+        with self.login_user_context(superuser):
+            response = self.client.get(endpoint)
+            self.assertContains(response, expected, html=True)
+
+    @override_settings(CMS_PERMISSION=False)
+    def test_set_existing_overwrite_url(self):
         superuser = self.get_superuser()
 
         create_page('home', 'nav_playground.html', 'en', published=True)
