Merge of all UI clustering changes originally applied to 2.2

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-02-15 14:59:11 +00:00
parent d20d8a7007
commit a450598ecb
281 changed files with 17771 additions and 15322 deletions

View File

@@ -48,10 +48,12 @@ import org.alfresco.web.ui.common.Utils;
/**
* Bean implementation for the "Run Action" wizard.
*
* @author gavinc
* @author gavinc
*/
public class RunActionWizard extends BaseActionWizard
{
private static final long serialVersionUID = 975435581009378899L;
protected boolean checkinActionPresent = false;
// ------------------------------------------------------------------------------
@@ -91,12 +93,12 @@ public class RunActionWizard extends BaseActionWizard
}
// add the action to the rule
Action action = this.actionService.createAction(actionName);
Action action = this.getActionService().createAction(actionName);
action.setParameterValues(repoActionParams);
// execute the action on the current document node
NodeRef nodeRef = new NodeRef(Repository.getStoreRef(), this.parameters.get("id"));
this.actionService.executeAction(action, nodeRef);
this.getActionService().executeAction(action, nodeRef);
}
return outcome;
@@ -108,7 +110,7 @@ public class RunActionWizard extends BaseActionWizard
if (this.actions == null)
{
NodeRef nodeRef = new NodeRef(Repository.getStoreRef(), this.parameters.get("id"));
List<ActionDefinition> ruleActions = this.actionService.getActionDefinitions(nodeRef);
List<ActionDefinition> ruleActions = this.getActionService().getActionDefinitions(nodeRef);
this.actions = new ArrayList<SelectItem>();
for (ActionDefinition ruleActionDef : ruleActions)
{