From 64b99bc21dd1123d859e5009803a207d067ccd80 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 21:05:04 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 57568: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 57531: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1) 57425: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8) 57422: MNT-9767: Merged DEV to PATCHES/V4.1.7 57268: MNT-9767 : Navigation arrows of the document details view do not work when a search result is displayed Was added the check for currentSortColumn when it is null in SpaceDetailsDialog. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61844 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/bean/spaces/SpaceDetailsDialog.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/web/bean/spaces/SpaceDetailsDialog.java b/source/java/org/alfresco/web/bean/spaces/SpaceDetailsDialog.java index f3bcb41049..71122b3241 100644 --- a/source/java/org/alfresco/web/bean/spaces/SpaceDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/spaces/SpaceDetailsDialog.java @@ -179,8 +179,11 @@ public class SpaceDetailsDialog extends BaseDetailsBean implements NavigationSup if (nodes.size() > 1) { String currentSortColumn = this.browseBean.getSpacesRichList().getCurrentSortColumn(); - boolean currentSortDescending = this.browseBean.getSpacesRichList().isCurrentSortDescending(); - Collections.sort(nodes, new NodePropertyComparator(currentSortColumn, !currentSortDescending)); + if (currentSortColumn != null) + { + boolean currentSortDescending = this.browseBean.getSpacesRichList().isCurrentSortDescending(); + Collections.sort(nodes, new NodePropertyComparator(currentSortColumn, !currentSortDescending)); + } next = NodeListUtils.nextItem(nodes, id); this.browseBean.setupSpaceAction(next.getId(), false); } @@ -208,8 +211,11 @@ public class SpaceDetailsDialog extends BaseDetailsBean implements NavigationSup if (nodes.size() > 1) { String currentSortColumn = this.browseBean.getSpacesRichList().getCurrentSortColumn(); - boolean currentSortDescending = this.browseBean.getSpacesRichList().isCurrentSortDescending(); - Collections.sort(nodes, new NodePropertyComparator(currentSortColumn, !currentSortDescending)); + if (currentSortColumn != null) + { + boolean currentSortDescending = this.browseBean.getSpacesRichList().isCurrentSortDescending(); + Collections.sort(nodes, new NodePropertyComparator(currentSortColumn, !currentSortDescending)); + } previous = NodeListUtils.previousItem(nodes, id); this.browseBean.setupSpaceAction(previous.getId(), false); }