X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FSuiteApp.java;h=ecb9ff781dbf0dd3eb8b21b0183ab0e57562834a;hp=7bb9991e0bd90d398c3250eaa7453487dfe0d27c;hb=306805ed46d62207c966c254c013a00ca10acee4;hpb=a670d54c9e6f4ccec86c6b29742d0b0530686290

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
index 7bb9991..ecb9ff7 100644
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
@@ -27,7 +27,7 @@ import org.argeo.cms.ui.util.CmsEvent;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.entity.EntityConstants;
 import org.argeo.entity.EntityNames;
-import org.argeo.entity.EntityTypes;
+import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.suite.RankedObject;
@@ -180,12 +180,19 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 				if (uiProvidersByType.containsKey(typeName)) {
 					types.add(typeName);
 				}
+				for (NodeType mixin : nodeType.getDeclaredSupertypes()) {
+					if (uiProvidersByType.containsKey(mixin.getName())) {
+						types.add(mixin.getName());
+					}
+				}
 			}
 			// entity type
-			if (context.isNodeType(EntityTypes.ENTITY_ENTITY)) {
-				String typeName =context.getProperty(EntityNames.ENTITY_TYPE).getString();
-				if (uiProvidersByType.containsKey(typeName)) {
-					types.add(typeName);
+			if (context.isNodeType(EntityType.entity.get())) {
+				if (context.hasProperty(EntityNames.ENTITY_TYPE)) {
+					String typeName = context.getProperty(EntityNames.ENTITY_TYPE).getString();
+					if (uiProvidersByType.containsKey(typeName)) {
+						types.add(typeName);
+					}
 				}
 			}