Merge V1.3 to HEAD (3045:3063)

svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3045 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3063 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3340 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/actions/RunActionWizard.java

@@ -10,6 +10,7 @@ import java.util.ResourceBundle;
 import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
 
+import org.alfresco.repo.action.executer.CheckInActionExecuter;
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ActionDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -26,9 +27,19 @@ import org.alfresco.web.data.QuickSort;
  */
 public class RunActionWizard extends BaseActionWizard
 {
+   protected boolean checkinActionPresent = false;
+   
    // ------------------------------------------------------------------------------
    // Wizard implementation
    
+   @Override
+   public void init(Map<String, String> parameters)
+   {
+      super.init(parameters);
+      
+      this.checkinActionPresent = false;
+   }
+   
    protected String finishImpl(FacesContext context, String outcome)
          throws Exception
    {
@@ -40,6 +51,12 @@ public class RunActionWizard extends BaseActionWizard
          String actionName = (String)actionParams.get(PROP_ACTION_NAME);
          this.action = actionName;
          
+         // remember the fact we have a checkin action
+         if (actionName.equals(CheckInActionExecuter.NAME))
+         {
+            this.checkinActionPresent = true;
+         }
+         
          // get the action handler to prepare for the save
          Map<String, Serializable> repoActionParams = new HashMap<String, Serializable>();
          IHandler handler = this.actionHandlers.get(this.action);
@@ -104,6 +121,14 @@ public class RunActionWizard extends BaseActionWizard
          space.reset();
       }
       
+      // special case handling for checkin - if it was successful the working
+      // copy node the Run Action Wizard was launched against will no longer
+      // exist, we therefore need the client to go back to the main browse view.
+      if (this.checkinActionPresent)
+      {
+         outcome = "browse";
+      }
+      
       return outcome;
    }