Fix plain Argeo Suite.

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 bfea829ec51fb4435cebf34bf515b1fde95dd414..7f2fe9fb53d6a6f5019d87817783d94601b8af15 100644 (file)
--- 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));
 
                // 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<SuiteLayer> layerObj = layers.get(layerId);
                        for (String layerId : adminLayers) {
                                if (layers.containsKey(layerId)) {
                                        RankedObject<SuiteLayer> layerObj = layers.get(layerId);

diff --git a/sdk/argeo-suite-rap.properties b/sdk/argeo-suite-rap.properties
index df068c6b5fdc287ba0c38de1a51ea54d8941d346..b9981f98cf1c070588222b3dc9554c4f0ba560d5 100644 (file)
--- 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.cms
 
 argeo.osgi.start.5.suite=\

+org.argeo.suite.core,\

 org.argeo.suite.ui,\
 org.argeo.suite.theme.default,\
 org.argeo.suite.ui.rap
 org.argeo.suite.ui,\
 org.argeo.suite.theme.default,\
 org.argeo.suite.ui.rap