From a701724cb9e8d25eefbe09ecc1b80bbe6c74e887 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Wed, 30 Apr 2014 16:13:31 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 68135: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 67592: MNT-10362: Merged DEV to V4.2-BUG-FIX (4.2.3). 66140: MNT-10362 Disabling QuickShare throws exception and previewer fails to load git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/jscript/People.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/source/java/org/alfresco/repo/jscript/People.java b/source/java/org/alfresco/repo/jscript/People.java index 07fb469bc4..e656ca1d6b 100644 --- a/source/java/org/alfresco/repo/jscript/People.java +++ b/source/java/org/alfresco/repo/jscript/People.java @@ -556,7 +556,7 @@ public class People extends BaseScopableProcessorExtension implements Initializi */ public Scriptable getPeople(String filter, int maxResults, String sortBy, boolean sortAsc) { - return getPeoplePaging(filter, new ScriptPagingDetails(maxResults, 0), null, null); + return getPeoplePaging(filter, new ScriptPagingDetails(maxResults, 0), sortBy, Boolean.valueOf(sortBy)); } public Scriptable getPeoplePaging(String filter, ScriptPagingDetails pagingRequest, String sortBy, Boolean sortAsc) @@ -894,13 +894,18 @@ public class People extends BaseScopableProcessorExtension implements Initializi @Override public int compare(NodeRef n1, NodeRef n2) { - String p1 = getProperty(n1); - String p2 = getProperty(n2); + Serializable p1 = getProperty(n1); + Serializable p2 = getProperty(n2); - return col.compare(p1, p2) * orderMultiplicator; + if ((p1 instanceof Long) && (p2 instanceof Long)) + { + return Long.compare((Long)p1, (Long)p2) * orderMultiplicator; + } + + return col.compare(p1.toString(), p2) * orderMultiplicator; } - public String getProperty(NodeRef nodeRef) + public Serializable getProperty(NodeRef nodeRef) { Serializable result; @@ -943,7 +948,7 @@ public class People extends BaseScopableProcessorExtension implements Initializi result = ""; } - return result.toString(); + return result; } });