From c6f5a067b6543c33a2c23fa083370806e5fa8d24 Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Wed, 2 Nov 2011 16:28:05 +0000
Subject: [PATCH] Fixed ALF-277: Add Content Dialog is displayed after cancel
 editing

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31646 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../web/bean/coci/CancelEditingDialog.java    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/web/bean/coci/CancelEditingDialog.java b/source/java/org/alfresco/web/bean/coci/CancelEditingDialog.java
index d53559f5ae..ea3640b758 100644
--- a/source/java/org/alfresco/web/bean/coci/CancelEditingDialog.java
+++ b/source/java/org/alfresco/web/bean/coci/CancelEditingDialog.java
@@ -21,6 +21,7 @@ package org.alfresco.web.bean.coci;
 import javax.faces.context.FacesContext;
 
 import org.alfresco.model.ContentModel;
+import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.ui.common.ReportedException;
@@ -41,8 +42,24 @@ public class CancelEditingDialog extends CheckinCheckoutDialog
     protected String finishImpl(FacesContext context, String outcome) throws Exception
     {
         undoCheckoutFile(context, outcome);
-        return "dialog:close[2]";
+        return outcome;
     }
+    
+    @Override 
+    protected String getDefaultCancelOutcome() 
+    { 
+       return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME + 
+              AlfrescoNavigationHandler.OUTCOME_SEPARATOR + 
+              AlfrescoNavigationHandler.OUTCOME_BROWSE; 
+    } 
+
+    @Override 
+    protected String getDefaultFinishOutcome() 
+    { 
+        return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME + 
+               AlfrescoNavigationHandler.OUTCOME_SEPARATOR + 
+               AlfrescoNavigationHandler.OUTCOME_BROWSE; 
+    } 
 
     @Override
     public String getContainerTitle()