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 V3.2 to HEAD

Browse Source 
16740: Fix for ETHREEOH-2563 and ETHREEOH-2899.
   16741: Fix for ETHREEOH-1781 - web-client-config-custom.xml.unicode.sample has incorrect comment.
   16757: Merged DEV-TEMPORARY to V3.2
      16730: ETHREEOH-2749: Entering a search containing a single quote breaks the script that performs next/previous page in OpenSearch JSF component
      16731: ETHREEOH-2411: Error message appears when trying to create advanced workflow with long description
      16732: ETHREEOH-1944: Navigation via shortcuts brings up incorrect dialogs
   16761: Merged DEV-TEMPORARY to V3.2
      16750: ETHREEOH-2405: system error if user goto Web Projects space from any web project which was deleted by another user.
   16762: Displaying error title when error text is displayed
   16763: Merged DEV-TEMPORARY to V3.2
      16756: ETHREEOH-258: System Error message appears while clicking "Manage Task" icon in "My Completed Task" component for the task, if the user to whom the workflow was assign to is deleted.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-10-14 11:08:21 +00:00
parent 94f41494f6
commit ba3f9629b5
7 changed files with 91 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Stack;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
@@ -97,6 +98,8 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
private static final String ML_VERSION_PANEL_ID = "ml-versions-panel";
private final static String DOC_DETAILS_STACK = "_alfDocDetailsStack";
transient protected LockService lockService;
transient protected VersionService versionService;
transient protected CheckOutCheckInService cociService;
@@ -140,6 +143,53 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
this.workflowProperties = null;
}
@Override
@SuppressWarnings("unchecked")
public void init(Map<String, String> parameters)
{
super.init(parameters);
//Remember active node.
Stack stack = getRecentNodeRefsStack();
stack.push(getNode().getNodeRef().getId());
}
@Override
@SuppressWarnings("unchecked")
public void restored()
{
super.restored();
Stack stack = getRecentNodeRefsStack();
if (stack.isEmpty() == false)
{
browseBean.setupContentAction((String) stack.peek(), true);
}
}
@Override
@SuppressWarnings("unchecked")
public String cancel()
{
Stack stack = getRecentNodeRefsStack();
if (stack.isEmpty() == false)
{
stack.pop();
}
return super.cancel();
}
@SuppressWarnings("unchecked")
private Stack getRecentNodeRefsStack()
{
FacesContext fc = FacesContext.getCurrentInstance();
Stack stack = (Stack) fc.getExternalContext().getSessionMap().get(DOC_DETAILS_STACK);
if (stack == null)
{
stack = new Stack();
fc.getExternalContext().getSessionMap().put(DOC_DETAILS_STACK, stack);
}
return stack;
}
/**
* Returns the URL to download content for the current document
*
@@ -692,6 +742,7 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
}
// prepare for showing details for this node
getRecentNodeRefsStack().clear();
this.browseBean.setupContentAction(next.getId(), false);
break;
}
@@ -731,6 +782,7 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
}
// prepare for showing details for this node
getRecentNodeRefsStack().clear();
this.browseBean.setupContentAction(previous.getId(), false);
break;
}