X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=core%2Forg.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FSuiteApp.java;h=bdcf30c87101e488b6654ac1fec9172843c69374;hb=c63feb33bc17eb7e4fc6f2b47f31695ab6dfe1f8;hp=c0dbc575f46168064c5df9d9f15c53a85351f9ec;hpb=6b66f008d1baa6cb54b3b16220572cfd572670f1;p=gpl%2Fargeo-suite.git

diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
index c0dbc57..bdcf30c 100644
--- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
+++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
@@ -55,6 +55,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 	public final static String PUBLIC_BASE_PATH_PROPERTY = "publicBasePath";
 	public final static String DEFAULT_UI_NAME_PROPERTY = "defaultUiName";
 	public final static String DEFAULT_THEME_ID_PROPERTY = "defaultThemeId";
+	public final static String DEFAULT_LAYER_PROPERTY = "defaultLayer";
 	private final static String LOGIN = "login";
 
 	private String publicBasePath = null;
@@ -88,6 +89,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 			defaultUiName = LangUtils.get(properties, DEFAULT_UI_NAME_PROPERTY);
 		if (properties.containsKey(DEFAULT_THEME_ID_PROPERTY))
 			defaultThemeId = LangUtils.get(properties, DEFAULT_THEME_ID_PROPERTY);
+		if (properties.containsKey(DEFAULT_LAYER_PROPERTY))
+			defaultLayerPid = LangUtils.get(properties, DEFAULT_LAYER_PROPERTY);
 		publicBasePath = LangUtils.get(properties, PUBLIC_BASE_PATH_PROPERTY);
 
 		if (properties.containsKey(Constants.SERVICE_PID)) {
@@ -155,6 +158,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 			CmsView cmsView = CmsView.getCmsView(parent);
 			CmsUiProvider headerUiProvider = findUiProvider(headerPid);
 			CmsUiProvider footerUiProvider = findUiProvider(footerPid);
+			CmsUiProvider leadPaneUiProvider = findUiProvider(leadPanePid);
+
 			Localized appTitle = null;
 			if (headerUiProvider instanceof DefaultHeader) {
 				appTitle = ((DefaultHeader) headerUiProvider).getTitle();
@@ -203,7 +208,9 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 					SuiteLayer layer = layersByPid.get(key).get();
 					ui.addLayer(key, layer);
 				}
-				refreshPart(findUiProvider(leadPanePid), ui.getLeadPane(), context);
+
+				if (leadPaneUiProvider != null)
+					refreshPart(leadPaneUiProvider, ui.getLeadPane(), context);
 				if (footerUiProvider != null)
 					refreshPart(footerUiProvider, ui.getFooter(), context);
 				ui.layout(true, true);
@@ -308,7 +315,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 			for (NodeType nodeType : context.getMixinNodeTypes()) {
 				sb.append(' ');
 				sb.append(nodeType.getName());
-				if (nodeType.getName().equals(EntityType.entity.get()))
+				if (nodeType.getName().equals(EntityType.local.get()))
 					sb.append('/').append(context.getProperty(EntityNames.ENTITY_TYPE).getString());
 				for (NodeType superType : nodeType.getDeclaredSupertypes()) {
 					sb.append(' ');