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 
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
This commit is contained in:
Alan Davis
2014-02-11 21:05:04 +00:00
parent 3b29107716
commit 64b99bc21d
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/web/bean/spaces/SpaceDetailsDialog.java
View File

@@ -179,8 +179,11 @@ public class SpaceDetailsDialog extends BaseDetailsBean implements NavigationSup
if (nodes.size() > 1) if (nodes.size() > 1)
{ {
String currentSortColumn = this.browseBean.getSpacesRichList().getCurrentSortColumn(); String currentSortColumn = this.browseBean.getSpacesRichList().getCurrentSortColumn();
if (currentSortColumn != null)
{
boolean currentSortDescending = this.browseBean.getSpacesRichList().isCurrentSortDescending(); boolean currentSortDescending = this.browseBean.getSpacesRichList().isCurrentSortDescending();
Collections.sort(nodes, new NodePropertyComparator(currentSortColumn, !currentSortDescending)); Collections.sort(nodes, new NodePropertyComparator(currentSortColumn, !currentSortDescending));
}
next = NodeListUtils.nextItem(nodes, id); next = NodeListUtils.nextItem(nodes, id);
this.browseBean.setupSpaceAction(next.getId(), false); this.browseBean.setupSpaceAction(next.getId(), false);
} }
@@ -208,8 +211,11 @@ public class SpaceDetailsDialog extends BaseDetailsBean implements NavigationSup
if (nodes.size() > 1) if (nodes.size() > 1)
{ {
String currentSortColumn = this.browseBean.getSpacesRichList().getCurrentSortColumn(); String currentSortColumn = this.browseBean.getSpacesRichList().getCurrentSortColumn();
if (currentSortColumn != null)
{
boolean currentSortDescending = this.browseBean.getSpacesRichList().isCurrentSortDescending(); boolean currentSortDescending = this.browseBean.getSpacesRichList().isCurrentSortDescending();
Collections.sort(nodes, new NodePropertyComparator(currentSortColumn, !currentSortDescending)); Collections.sort(nodes, new NodePropertyComparator(currentSortColumn, !currentSortDescending));
}
previous = NodeListUtils.previousItem(nodes, id); previous = NodeListUtils.previousItem(nodes, id);
this.browseBean.setupSpaceAction(previous.getId(), false); this.browseBean.setupSpaceAction(previous.getId(), false);
} }