From ffff32551360f7eee7c03a16124a78dc4b34c1d5 Mon Sep 17 00:00:00 2001 From: Mikel Larreategi Date: Thu, 11 Jun 2026 22:19:52 +0200 Subject: [PATCH 1/2] fix: fix subsite controlpanels --- news/2.bugfix | 1 + .../profiles/default6/actions.xml | 19 ++++- .../profiles/default6/controlpanel.xml | 76 +++++++++---------- 3 files changed, 57 insertions(+), 39 deletions(-) create mode 100644 news/2.bugfix diff --git a/news/2.bugfix b/news/2.bugfix new file mode 100644 index 0000000..2c44c4d --- /dev/null +++ b/news/2.bugfix @@ -0,0 +1 @@ +Fix subsite controlpanels @erral diff --git a/src/lineage/controlpanels/profiles/default6/actions.xml b/src/lineage/controlpanels/profiles/default6/actions.xml index ce88c9c..f0f9eb9 100644 --- a/src/lineage/controlpanels/profiles/default6/actions.xml +++ b/src/lineage/controlpanels/profiles/default6/actions.xml @@ -7,12 +7,29 @@ name="user" purge="False" > + + Site Setup + + string:plone-controlpanel + + python:plone_portal_state.navigation_root().restrictedTraverse('@@lineageutils').isChildSite() + string:${plone_portal_state/navigation_root_url}/@@overview-controlpanel + + + + True + + - string:${plone_portal_state/navigation_root_url}/@@overview-controlpanel + not:python:plone_portal_state.navigation_root().restrictedTraverse('@@lineageutils').isChildSite() diff --git a/src/lineage/controlpanels/profiles/default6/controlpanel.xml b/src/lineage/controlpanels/profiles/default6/controlpanel.xml index e202e0c..dabb75e 100644 --- a/src/lineage/controlpanels/profiles/default6/controlpanel.xml +++ b/src/lineage/controlpanels/profiles/default6/controlpanel.xml @@ -7,7 +7,7 @@ @@ -34,7 +34,7 @@ condition_expr="" icon_expr="string:clock" title="Date and Time" - url_expr="string:${object/aq_parent/absolute_url}/@@dateandtime-controlpanel" + url_expr="string:${plone_portal_state/navigation_root_url}/@@dateandtime-controlpanel" visible="True" i18n:attributes="title" > @@ -43,10 +43,10 @@ @@ -55,10 +55,10 @@ @@ -70,7 +70,7 @@ condition_expr="" icon_expr="string:toggles" title="User and Group Settings" - url_expr="string:${object/aq_parent/absolute_url}/@@usergroup-controlpanel" + url_expr="string:${plone_portal_state/navigation_root_url}/@@usergroup-controlpanel" visible="True" i18n:attributes="title" > @@ -82,7 +82,7 @@ condition_expr="" icon_expr="string:card-list" title="Member Fields" - url_expr="string:${object/aq_parent/absolute_url}/@@member-fields" + url_expr="string:${plone_portal_state/navigation_root_url}/@@member-fields" visible="True" i18n:attributes="title" > @@ -94,7 +94,7 @@ condition_expr="" icon_expr="string:person" title="Personal Preferences" - url_expr="string:${object/aq_parent/absolute_url}/@@personal-preferences" + url_expr="string:${plone_portal_state/navigation_root_url}/@@personal-preferences" visible="True" i18n:attributes="title" > @@ -106,7 +106,7 @@ condition_expr="python:member.canPasswordSet()" icon_expr="string:lock" title="Change Password" - url_expr="string:${object/aq_parent/absolute_url}/password_form" + url_expr="string:${plone_portal_state/navigation_root_url}/password_form" visible="True" i18n:attributes="title" > @@ -118,7 +118,7 @@ condition_expr="" icon_expr="string:envelope-open" title="Mail" - url_expr="string:${object/aq_parent/absolute_url}/@@mail-controlpanel" + url_expr="string:${plone_portal_state/navigation_root_url}/@@mail-controlpanel" visible="True" i18n:attributes="title" > @@ -130,7 +130,7 @@ condition_expr="" icon_expr="string:pencil" title="Editing" - url_expr="string:${object/aq_parent/absolute_url}/@@editing-controlpanel" + url_expr="string:${plone_portal_state/navigation_root_url}/@@editing-controlpanel" visible="True" i18n:attributes="title" > @@ -139,7 +139,7 @@ @@ -175,7 +175,7 @@ @@ -214,7 +214,7 @@ condition_expr="" icon_expr="string:list-nested" title="Navigation" - url_expr="string:${object/aq_parent/absolute_url}/@@navigation-controlpanel" + url_expr="string:${plone_portal_state/navigation_root_url}/@@navigation-controlpanel" visible="True" i18n:attributes="title" > @@ -226,7 +226,7 @@ condition_expr="" icon_expr="string:flag" title="Language" - url_expr="string:${object/aq_parent/absolute_url}/@@language-controlpanel" + url_expr="string:${plone_portal_state/navigation_root_url}/@@language-controlpanel" visible="True" i18n:attributes="title" > @@ -235,7 +235,7 @@ @@ -271,7 +271,7 @@ @@ -298,7 +298,7 @@ condition_expr="" icon_expr="string:volume-up" title="Social Media" - url_expr="string:${object/aq_parent/absolute_url}/@@social-controlpanel" + url_expr="string:${plone_portal_state/navigation_root_url}/@@social-controlpanel" visible="True" i18n:attributes="title" > @@ -310,7 +310,7 @@ condition_expr="" icon_expr="string:image" title="Image Handling" - url_expr="string:${object/aq_parent/absolute_url}/@@imaging-controlpanel" + url_expr="string:${plone_portal_state/navigation_root_url}/@@imaging-controlpanel" visible="True" i18n:attributes="title" > @@ -322,7 +322,7 @@ condition_expr="" icon_expr="string:lightning" title="Actions" - url_expr="string:${object/aq_parent/absolute_url}/@@actions-controlpanel" + url_expr="string:${plone_portal_state/navigation_root_url}/@@actions-controlpanel" visible="True" i18n:attributes="title" > @@ -334,7 +334,7 @@ condition_expr="" icon_expr="string:alt" title="URL Management" - url_expr="string:${object/aq_parent/absolute_url}/@@redirection-controlpanel" + url_expr="string:${plone_portal_state/navigation_root_url}/@@redirection-controlpanel" visible="True" i18n:attributes="title" > @@ -348,7 +348,7 @@ condition_expr="exists:object/aq_parent/@@moderate-comments-enabled" icon_expr="string:chat-square-dots" title="Discussion" - url_expr="string:${object/aq_parent/absolute_url}/@@discussion-controlpanel" + url_expr="string:${plone_portal_state/navigation_root_url}/@@discussion-controlpanel" visible="True" i18n:attributes="title" > @@ -362,7 +362,7 @@ condition_expr="" icon_expr="string:display" title="Theming" - url_expr="string:${object/aq_parent/absolute_url}/@@theming-controlpanel" + url_expr="string:${plone_portal_state/navigation_root_url}/@@theming-controlpanel" visible="True" i18n:attributes="title" > @@ -372,7 +372,7 @@ @@ -399,7 +399,7 @@ Date: Thu, 11 Jun 2026 22:22:06 +0200 Subject: [PATCH 2/2] lint --- .../controlpanels/profiles/default6/actions.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/lineage/controlpanels/profiles/default6/actions.xml b/src/lineage/controlpanels/profiles/default6/actions.xml index f0f9eb9..b942f0f 100644 --- a/src/lineage/controlpanels/profiles/default6/actions.xml +++ b/src/lineage/controlpanels/profiles/default6/actions.xml @@ -11,14 +11,18 @@ name="plone_setup_subsite" i18n:domain="plone" > - Site Setup - + Site Setup + string:plone-controlpanel python:plone_portal_state.navigation_root().restrictedTraverse('@@lineageutils').isChildSite() string:${plone_portal_state/navigation_root_url}/@@overview-controlpanel - + True @@ -28,8 +32,7 @@ purge="False" i18n:domain="plone" > - not:python:plone_portal_state.navigation_root().restrictedTraverse('@@lineageutils').isChildSite() + not:python:plone_portal_state.navigation_root().restrictedTraverse('@@lineageutils').isChildSite()