X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FRecentItems.java;h=bbe53b77c26af3aba62ff1f82afaa8601a5357ea;hb=d21b6765434d473fe04de867e2c3e773a6da8030;hp=e0415a0304baf8473adf5d74f0e4bd9ef3413cf3;hpb=5f3933c6262a3f45212299f6f0ec3c29a2e411bf;p=gpl%2Fargeo-suite.git

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 e0415a0..bbe53b7 100644
--- 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,8 @@ 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.EntityConstants;
+import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.suite.ui.widgets.DelayedText;
@@ -56,10 +57,6 @@ public class RecentItems implements CmsUiProvider {
 	private final static int SEARCH_TEXT_DELAY = 800;
 	private final static int SEARCH_DEFAULT_LIMIT = 100;
 
-	public static enum Property {
-		entityTypes;
-	}
-
 	private CmsTheme theme;
 
 	private String entityType;
@@ -132,7 +129,7 @@ public class RecentItems implements CmsUiProvider {
 
 	public void init(Map<String, String> properties) {
 		// TODO manage multiple entities
-		entityType = properties.get(Property.entityTypes.name());
+		entityType = properties.get(EntityConstants.TYPE);
 	}
 
 	class SingleEntityViewer {
@@ -294,11 +291,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))