From c813f6f1fdff65e43bdf56a49f9a93ddc8808d73 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 4 Jan 2021 07:03:49 +0100 Subject: [PATCH] Fix plain Argeo Suite. --- org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java | 2 +- sdk/argeo-suite-rap.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java index bfea829..7f2fe9f 100644 --- a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java +++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java @@ -74,7 +74,7 @@ public class DefaultLeadPane implements CmsUiProvider { // TODO factorise boolean isAdmin = cmsView.doAs(() -> CurrentUser.isInRole(NodeConstants.ROLE_USER_ADMIN)); - if (isAdmin) + if (isAdmin && adminLayers != null) for (String layerId : adminLayers) { if (layers.containsKey(layerId)) { RankedObject layerObj = layers.get(layerId); diff --git a/sdk/argeo-suite-rap.properties b/sdk/argeo-suite-rap.properties index df068c6..b9981f9 100644 --- a/sdk/argeo-suite-rap.properties +++ b/sdk/argeo-suite-rap.properties @@ -11,6 +11,7 @@ argeo.osgi.start.3.node=\ org.argeo.cms argeo.osgi.start.5.suite=\ +org.argeo.suite.core,\ org.argeo.suite.ui,\ org.argeo.suite.theme.default,\ org.argeo.suite.ui.rap -- 2.30.2