[portal-commits] JBoss Portal SVN: r13850 - in branches/Enterprise_Portal_Platform_4_3/core-admin/src: resources/portal-admin-war/jsf and 1 other directories.

Author: thomas.heute(a)jboss.com Date: 2009-12-02 05:03:09 -0500 (Wed, 02 Dec 2009) New Revision: 13850 Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml Log: JBEPP-146: null appears in content when Initial Mode property is set to Minimized (If people had the value set through the admin console prior to this fix, this can be reset through the same admin feature) Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2009-12-02 09:42:51 UTC (rev 13849) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2009-12-02 10:03:09 UTC (rev 13850) @@ -389,7 +389,7 @@ for (IteratorStatus i = new IteratorStatus(children.iterator()); i.hasNext();) { PortalObject portalObject = (PortalObject)i.next(); - if (portalObject.getDeclaredProperties().containsValue("MAXIMIZED")) + if (portalObject.getDeclaredProperties().containsValue("maximized")) { return Boolean.TRUE; } Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2009-12-02 09:42:51 UTC (rev 13849) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2009-12-02 10:03:09 UTC (rev 13850) @@ -109,17 +109,17 @@ <h:selectOneMenu id="prop-value-select" styleClass="portlet-form-input-field" value="#{prop.value}" - rendered="#{prop.type eq 'java.lang.String' and prop.name eq 'portal.windowInitialState' and (!portalobjectmgr.maximizedStateExists or prop.value eq 'MAXIMIZED')}"> + rendered="#{prop.type eq 'java.lang.String' and prop.name eq 'portal.windowInitialState' and (!portalobjectmgr.maximizedStateExists or prop.value eq 'maximized')}"> <f:selectItem itemLabel="Choose One..." itemValue=""/> - <f:selectItem itemLabel="Maximized" itemValue="MAXIMIZED"/> - <f:selectItem itemLabel="Minimized" itemValue="MINIMIZED"/> - <f:selectItem itemLabel="Normal" itemValue="NORMAL"/> + <f:selectItem itemLabel="Maximized" itemValue="maximized"/> + <f:selectItem itemLabel="Minimized" itemValue="minimized"/> + <f:selectItem itemLabel="Normal" itemValue="normal"/> </h:selectOneMenu> <h:selectOneMenu id="prop-value-select1" styleClass="portlet-form-input-field" value="#{prop.value}" disabled="true" - rendered="#{prop.type eq 'java.lang.String' and prop.name eq 'portal.windowInitialState' and (portalobjectmgr.maximizedStateExists and prop.value ne 'MAXIMIZED')}"> - <f:selectItem itemLabel="Minimized" itemValue="MINIMIZED"/> + rendered="#{prop.type eq 'java.lang.String' and prop.name eq 'portal.windowInitialState' and (portalobjectmgr.maximizedStateExists and prop.value ne 'maximized')}"> + <f:selectItem itemLabel="Minimized" itemValue="minimized"/> </h:selectOneMenu> @@ -150,4 +150,4 @@ </div> -</ui:composition> \ No newline at end of file +</ui:composition> Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2009-12-02 09:42:51 UTC (rev 13849) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2009-12-02 10:03:09 UTC (rev 13850) @@ -151,16 +151,16 @@ </f:facet> <h:graphicImage - title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? bundle.THIS_MINIMIZED_STATE : bundle.THIS_NORMAL_STATE}." + title="#{object.declaredProperties['portal.windowInitialState'] eq 'minimized' ? bundle.THIS_MINIMIZED_STATE : bundle.THIS_NORMAL_STATE}." rendered="#{!maximizedStateExists}" - value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }" + value="#{object.declaredProperties['portal.windowInitialState'] eq 'minimized' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }" styleClass="windowStateIcon" alt=""/> <h:graphicImage - title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? bundle.THIS_MAXIMIZED_STATE : bundle.THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED}." + title="#{object.declaredProperties['portal.windowInitialState'] eq 'maximized' ? bundle.THIS_MAXIMIZED_STATE : bundle.THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED}." rendered="#{maximizedStateExists}" - value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}" + value="#{object.declaredProperties['portal.windowInitialState'] eq 'maximized' ? '/img/max-icon.gif' : '/img/min-icon.gif'}" styleClass="windowStateIcon" alt=""/>