Support JCR node types as entity types.

diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityType.java b/org.argeo.entity.api/src/org/argeo/entity/EntityType.java
index 6548d7599578793d2f8494621406ad3e9d45aaca..7b470bbc5c65e95c106b4fd3786dfac66acd8e2e 100644 (file)
--- a/org.argeo.entity.api/src/org/argeo/entity/EntityType.java
+++ b/org.argeo.entity.api/src/org/argeo/entity/EntityType.java
@@ -7,7 +7,7 @@ public enum EntityType implements JcrName {
        // typology
        typologies, terms, term,
        // form
-       form, formSet,
+       form, formSet, formSubmission,
        // ldap
        person;
 

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java
index e0415a0304baf8473adf5d74f0e4bd9ef3413cf3..5c6fa0de79a754a11cde4d08ee8c74ddd008f038 100644 (file)
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java
@@ -20,7 +20,7 @@ import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ui.CmsView;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.entity.EntityTypes;
+import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.suite.ui.widgets.DelayedText;
@@ -294,11 +294,17 @@ public class RecentItems implements CmsUiProvider {
 
                                // XPATH Query
                                String xpathQueryStr;
-                               if (entityType != null)
-                                       xpathQueryStr = entityType.contains(":") ? "//element(*, " + entityType + ")"
-                                                       : "//element(*, " + EntityTypes.ENTITY_ENTITY + ")[@entity:type='" + entityType + "']";
-                               else
-                                       xpathQueryStr = "//element(*, " + EntityTypes.ENTITY_ENTITY + ")";
+                               if (entityType != null) {
+                                       int indexColumn = entityType.indexOf(':');
+                                       if (indexColumn > 0) {// JCR node type
+                                               xpathQueryStr = "//element(*, " + entityType + ") order by @jcr:created descending";
+                                       } else {
+                                               xpathQueryStr = entityType.contains(":") ? "//element(*, " + entityType + ")"
+                                                               : "//element(*, " + EntityType.entity.get() + ")[@entity:type='" + entityType + "']";
+                                       }
+                               } else {
+                                       xpathQueryStr = "//element(*, " + EntityType.entity.get() + ")";
+                               }
 //                     String xpathQueryStr = "//element(*, " + ConnectTypes.CONNECT_ENTITY + ")";
                                String xpathFilter = XPathUtils.getFreeTextConstraint(filter);
                                if (notEmpty(xpathFilter))

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 7bb9991e0bd90d398c3250eaa7453487dfe0d27c..ecb9ff781dbf0dd3eb8b21b0183ab0e57562834a 100644 (file)
--- 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);
+                                       }
                                }
                        }