Author: thomas.heute(a)jboss.com Date: 2007-04-27 10:34:59 -0400 (Fri, 27 Apr 2007) New Revision: 7110 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/selectPortal.xhtml Log: Fixed Wizard bug (portals list was empty) 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-04-27 14:32:26 UTC (rev 7109) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java 2007-04-27 14:34:59 UTC (rev 7110) @@ -187,6 +187,13 @@ return portalObjectContainer.getObject(id); } + public List getPortals() + { + PortalObject root = portalObjectContainer.getRootObject(); + return new ArrayList(root.getChildren(PortalObject.PORTAL_MASK)); + } + + public List getPages() { if (selectedParentPageId != null) Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml 2007-04-27 14:32:26 UTC (rev 7109) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml 2007-04-27 14:34:59 UTC (rev 7110) @@ -16,7 +16,7 @@ </tbody> <tbody> <h:form> - <c:forEach items="#{portalobjectmgr.selectedObject.portals}" var="object" varStatus="status"> + <c:forEach items="#{newWindowWizard.portals}" var="object" varStatus="status"> <tr class="#{object.id == newWindowWizard.selectedPortalId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> <td>