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 
57137: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56920: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56837: MNT-9767: Merged DEV to V4.1-BUG-FIX
         	56823: 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. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61762 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 20:00:20 +00:00
parent ed9477730b
commit 49e49cfef6
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java
View File

@@ -715,8 +715,11 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
if (nodes.size() > 1) if (nodes.size() > 1)
{ {
String currentSortColumn = this.browseBean.getContentRichList().getCurrentSortColumn(); String currentSortColumn = this.browseBean.getContentRichList().getCurrentSortColumn();
boolean currentSortDescending = this.browseBean.getContentRichList().isCurrentSortDescending(); if (currentSortColumn != null)
Collections.sort(nodes, new NodePropertyComparator(currentSortColumn, !currentSortDescending)); {
boolean currentSortDescending = this.browseBean.getContentRichList().isCurrentSortDescending();
Collections.sort(nodes, new NodePropertyComparator(currentSortColumn, !currentSortDescending));
}
Node next = NodeListUtils.nextItem(nodes, id); Node next = NodeListUtils.nextItem(nodes, id);
getRecentNodeRefsStack().clear(); getRecentNodeRefsStack().clear();
this.browseBean.setupContentAction(next.getId(), false); this.browseBean.setupContentAction(next.getId(), false);
@@ -738,8 +741,11 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
if (nodes.size() > 1) if (nodes.size() > 1)
{ {
String currentSortColumn = this.browseBean.getContentRichList().getCurrentSortColumn(); String currentSortColumn = this.browseBean.getContentRichList().getCurrentSortColumn();
boolean currentSortDescending = this.browseBean.getContentRichList().isCurrentSortDescending(); if (currentSortColumn != null)
Collections.sort(nodes, new NodePropertyComparator(currentSortColumn, !currentSortDescending)); {
boolean currentSortDescending = this.browseBean.getContentRichList().isCurrentSortDescending();
Collections.sort(nodes, new NodePropertyComparator(currentSortColumn, !currentSortDescending));
}
Node previous = NodeListUtils.previousItem(nodes, id); Node previous = NodeListUtils.previousItem(nodes, id);
getRecentNodeRefsStack().clear(); getRecentNodeRefsStack().clear();
this.browseBean.setupContentAction(previous.getId(), false); this.browseBean.setupContentAction(previous.getId(), false);