Author: thomas.heute(a)jboss.com Date: 2007-05-07 09:38:07 -0400 (Mon, 07 May 2007) New Revision: 7218 Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml Log: Fix: JBPORTAL-1382 Switching into, out of and back into Wizard Mode in the admin portlet doesn't reset the step state properly Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java 2007-05-07 13:28:04 UTC (rev 7217) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java 2007-05-07 13:38:07 UTC (rev 7218) @@ -271,7 +271,7 @@ selectedPortletInvokerId = null; selectedParentPageId = null; currentStep = 0; - return "index"; + return "wizardMode"; } public List getRegions() Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml 2007-05-07 13:28:04 UTC (rev 7217) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml 2007-05-07 13:38:07 UTC (rev 7218) @@ -21,7 +21,7 @@ </c:choose> <h:form> - <p style="text-align: right"><h:commandLink action="wizardMode">Switch to wizard mode</h:commandLink></p> + <p style="text-align: right"><h:commandLink action="#{newWindowWizard.reset}">Switch to wizard mode</h:commandLink></p> </h:form> </div>