Author: thomas.heute(a)jboss.com Date: 2007-05-07 09:28:04 -0400 (Mon, 07 May 2007) New Revision: 7217 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/wizard/selectPage.xhtml Log: Fix JBPORTAL-1381: When selecting a Sub Page in the Add Portlet Wizard Mode, there is no way to navigate up to a parent pageWhen selecting a Sub Page in the Add Portlet Wizard Mode, there is no way to navigate up to a parent page Fix JBPORTAL-1384: User can go to step 2 in Wizard Mode without selecting a Portlet Window 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:23:00 UTC (rev 7216) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java 2007-05-07 13:28:04 UTC (rev 7217) @@ -112,6 +112,7 @@ currentStep = 2; selectedPageId = null; selectedRegionId = null; + selectedParentPageId = selectedPortalId; return (String)steps.get(currentStep); } @@ -132,6 +133,16 @@ return (String)steps.get(currentStep); } + public String up() + { + FacesContext ctx = FacesContext.getCurrentInstance(); + String id = (String)ctx.getExternalContext().getRequestParameterMap().get("id"); + Page page = (Page)getObjectFromId(id); + selectedParentPageId = page.getParent().getId().toString(PortalObjectId.LEGACY_BASE64_FORMAT); + currentStep = 2; + return (String)steps.get(currentStep); + } + public String selectRegion() { FacesContext ctx = FacesContext.getCurrentInstance(); @@ -166,9 +177,9 @@ return (Page)getObjectFromId(selectedPageId); } - public Page getSelectedParentPage() + public PortalObject getSelectedParentPage() { - return (Page)getObjectFromId(selectedParentPageId); + return (PortalObject)getObjectFromId(selectedParentPageId); } public Portal getSelectedPortal() @@ -291,6 +302,11 @@ return selectedPageId; } + public String getSelectedParentPageId() + { + return selectedParentPageId; + } + public String getSelectedRegionId() { return selectedRegionId; @@ -348,6 +364,10 @@ public boolean getNextEnabled() { + if (currentStep == 0) + { + return (selectedPortletId != null); + } if (currentStep == 1) { return (selectedPortalId != null); Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-05-07 13:23:00 UTC (rev 7216) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-05-07 13:28:04 UTC (rev 7217) @@ -17,6 +17,10 @@ </tbody> <tbody> <h:form> + <h:commandLink action="#{newWindowWizard.up}" rendered="#{newWindowWizard.selectedParentPage.type != 1}"> + <h:outputText value="Up"/> + <f:param name="id" value="#{newWindowWizard.selectedParentPageId}"/> + </h:commandLink> <c:forEach items="#{newWindowWizard.pages}" var="object" varStatus="status"> <tr class="#{object.id == newWindowWizard.selectedPageId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">