Skip to content

Commit

Permalink
Update Site Setup link in all control panels (fixes plone/Products.CM…
Browse files Browse the repository at this point in the history
  • Loading branch information
davilima6 committed Nov 23, 2015
1 parent 7c82483 commit 329f02d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
3 changes: 2 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ New:

Fixes:

- *add item here*
- Update Site Setup link in all control panels (fixes https://github.com/plone/Products.CMFPlone/issues/1255)
[davilima6]


2.3.2 (2015-10-28)
Expand Down
3 changes: 1 addition & 2 deletions plone/app/users/browser/registersettingspanel.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from z3c.form import field
from z3c.form import form
from z3c.form.browser.orderedselect import OrderedSelectFieldWidget
from zope.component import getMultiAdapter


class RegistrationControlPanel(form.Form):
Expand Down Expand Up @@ -64,7 +63,7 @@ def action_save(self, action):
# (self.context, self.request),
# name='absolute_url'
# )()
# self.request.response.redirect(url + '/plone_control_panel')
# self.request.response.redirect(url + '/@@overview-controlpanel')

def updateActions(self):
super(RegistrationControlPanel, self).updateActions()
Expand Down
8 changes: 3 additions & 5 deletions plone/app/users/browser/schema_layout.pt
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@

<div metal:fill-slot="prefs_configlet_main">

<a href=""
id="setup-link"
tal:attributes="href string:$portal_url/plone_control_panel"
<a id="setup-link" class="link-parent"
tal:attributes="href string:$portal_url/@@overview-controlpanel"
i18n:translate="">
Site Setup
</a> &rsaquo;
Expand All @@ -37,7 +36,7 @@
href="${portal_url}/@@member-fields"
i18n:translate="label_member_fields">Member fields</a>
</div>
<tal:block tal:replace="structure view/contents|view/render"/>
<tal:block tal:replace="structure view/contents|view/render" />
</div>

</div>
Expand All @@ -46,4 +45,3 @@

</body>
</html>

2 changes: 1 addition & 1 deletion plone/app/users/tests/flexible_user_registration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ depend on a mail server properly set-up:
True

Check that the site admin has a link to the configlet in the control panel.
>>> browser.open('http://nohost/plone/plone_control_panel')
>>> browser.open('http://nohost/plone/@@overview-controlpanel')
>>> browser.getLink('Users and Groups').click()
>>> 'Member fields' in browser.contents
True
Expand Down

0 comments on commit 329f02d

Please sign in to comment.