mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merge V1.3 to HEAD (2976:3004)
svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@2976 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3004 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -14,6 +14,7 @@ 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;
|
||||
@@ -89,7 +90,19 @@ 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();
|
||||
}
|
||||
|
||||
return outcome;
|
||||
}
|
||||
|
Reference in New Issue
Block a user