diff --git a/CHANGES.rst b/CHANGES.rst index bc6a2a1..8cb33dd 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,6 +10,9 @@ New: Fixes: +- Update Site Setup link in all control panels (fixes https://github.com/plone/Products.CMFPlone/issues/1255) + [davilima6] + - Move translations to plone.app.locales https://github.com/plone/plone.app.discussion/issues/66 [gforcada] diff --git a/plone/app/discussion/browser/controlpanel.pt b/plone/app/discussion/browser/controlpanel.pt index f050f5a..b389c24 100644 --- a/plone/app/discussion/browser/controlpanel.pt +++ b/plone/app/discussion/browser/controlpanel.pt @@ -5,13 +5,11 @@ lang="en" metal:use-macro="here/prefs_main_template/macros/master" i18n:domain="plone"> -
-
@@ -74,9 +72,8 @@ Portal status message
- Site Setup @@ -92,6 +89,7 @@ +
diff --git a/plone/app/discussion/tests/functional_test_comments.txt b/plone/app/discussion/tests/functional_test_comments.txt index 56b8736..ccdb4ff 100644 --- a/plone/app/discussion/tests/functional_test_comments.txt +++ b/plone/app/discussion/tests/functional_test_comments.txt @@ -262,7 +262,7 @@ Log in as admin Use the Plone control panel to enable comment editing. - >>> browser.open(portal_url + '/plone_control_panel') + >>> browser.open(portal_url + '/@@overview-controlpanel') >>> browser.getLink('Discussion').click() >>> browser.getControl('Enable editing of comments').selected = True >>> browser.getControl(name='form.buttons.save').click()