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

Merge from HEAD into WCM-DEV2. Also fixes build breakage in

Browse Source 
jndi-client and catalina-virtual that I introduced earlier. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-07-24 18:27:41 +00:00
parent ca9496d090
commit f6355ea108
171 changed files with 11880 additions and 3450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/java/org/alfresco/web/bean/actions/RunActionWizard.java
View File

@@ -10,10 +10,12 @@ 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;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.data.IDataContainer;
import org.alfresco.web.data.QuickSort;
@@ -25,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
{
@@ -39,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);
@@ -89,7 +107,27 @@ public class RunActionWizard extends BaseActionWizard
{
// reset the current document properties/aspects in case we have changed them
// during the execution of the custom action
this.browseBean.getDocument().reset();
Node document = this.browseBean.getDocument();
if (document != null)
{
document.reset();
}
// reset the current space properties/aspects as well in case we have
// changed them during the execution of the custom action
Node space = this.browseBean.getActionSpace();
if (space != null)
{
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;
}