From f8caa0b57137c4fee6e5e5f7f5d9f816a36b90e8 Mon Sep 17 00:00:00 2001 From: Keiji Suzuki Date: Fri, 1 May 2015 12:12:16 +0900 Subject: [PATCH] Sort collections with name including thier names of parent communities --- .../src/main/java/org/dspace/content/Collection.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dspace-api/src/main/java/org/dspace/content/Collection.java b/dspace-api/src/main/java/org/dspace/content/Collection.java index 0f832c145d28..2b43bace669c 100644 --- a/dspace-api/src/main/java/org/dspace/content/Collection.java +++ b/dspace-api/src/main/java/org/dspace/content/Collection.java @@ -9,6 +9,7 @@ import org.apache.log4j.Logger; import org.dspace.app.util.AuthorizeUtil; +import org.dspace.app.util.CollectionDropDown; import org.dspace.authorize.AuthorizeConfiguration; import org.dspace.authorize.AuthorizeException; import org.dspace.authorize.AuthorizeManager; @@ -1767,7 +1768,12 @@ public static Collection[] findGroup2CommunityMapped(Context context) throws SQL public static class CollectionComparator implements Comparator { @Override public int compare(Collection collection1, Collection collection2) { - return collection1.getName().compareTo(collection2.getName()); + try { + return CollectionDropDown.collectionPath(collection1).compareTo(CollectionDropDown.collectionPath(collection2)); + } + catch (SQLException e) { + return 0; + } } }