inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
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
This commit is contained in:
Mark Rogers
2014-04-30 16:13:31 +00:00
parent d72d6e0d47
commit a701724cb9
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/java/org/alfresco/repo/jscript/People.java
View File

@@ -556,7 +556,7 @@ public class People extends BaseScopableProcessorExtension implements Initializi
*/ */
public Scriptable getPeople(String filter, int maxResults, String sortBy, boolean sortAsc) 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) public Scriptable getPeoplePaging(String filter, ScriptPagingDetails pagingRequest, String sortBy, Boolean sortAsc)
@@ -894,13 +894,18 @@ public class People extends BaseScopableProcessorExtension implements Initializi
@Override @Override
public int compare(NodeRef n1, NodeRef n2) public int compare(NodeRef n1, NodeRef n2)
{ {
String p1 = getProperty(n1); Serializable p1 = getProperty(n1);
String p2 = getProperty(n2); 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; Serializable result;
@@ -943,7 +948,7 @@ public class People extends BaseScopableProcessorExtension implements Initializi
result = ""; result = "";
} }
return result.toString(); return result;
} }
}); });