diff --git a/source/java/org/alfresco/web/bean/wizard/WizardManager.java b/source/java/org/alfresco/web/bean/wizard/WizardManager.java index 00cf595fba..29e5899ac1 100644 --- a/source/java/org/alfresco/web/bean/wizard/WizardManager.java +++ b/source/java/org/alfresco/web/bean/wizard/WizardManager.java @@ -113,15 +113,15 @@ public final class WizardManager "' does not implement the required IWizardBean interface"); } + // create the WizardState object + this.currentWizardState = new WizardState(config, wizard); + // initialise the managed bean wizard.init(this.paramsToApply); // reset the current parameters so subsequent wizards don't get them this.paramsToApply = null; - // create the WizardState object - this.currentWizardState = new WizardState(config, wizard); - // setup the first step determineCurrentPage(); } diff --git a/source/java/org/alfresco/web/ui/repo/component/UIActions.java b/source/java/org/alfresco/web/ui/repo/component/UIActions.java index 34aafe12bd..51eda4061f 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UIActions.java +++ b/source/java/org/alfresco/web/ui/repo/component/UIActions.java @@ -649,6 +649,19 @@ public class UIActions extends SelfRenderingComponent this.verticalSpacing = verticalSpacing; } + // ------------------------------------------------------------------------------ + // Helper methods + + /** + * Resets the component to force a re-initialisation. + */ + public void reset() + { + // clear any child components and reset the list of groups + this.getChildren().clear(); + this.groups.clear(); + } + /** * @return a unique ID for a JSF component */ @@ -657,7 +670,6 @@ public class UIActions extends SelfRenderingComponent return "_id_" + Short.toString(++id); } - // ------------------------------------------------------------------------------ // Private data diff --git a/source/java/org/alfresco/web/ui/repo/component/UISidebar.java b/source/java/org/alfresco/web/ui/repo/component/UISidebar.java index 54e45a03d0..759b894e0a 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UISidebar.java +++ b/source/java/org/alfresco/web/ui/repo/component/UISidebar.java @@ -152,7 +152,7 @@ public class UISidebar extends SelfRenderingComponent // update the child UIActions component with the correct // action group id and clear it's current children UIActions actions = (UIActions)this.getChildren().get(1); - actions.getChildren().clear(); + actions.reset(); setupActionGroupId(context, actions); } }