Author: julien(a)jboss.com Date: 2007-06-24 18:30:34 -0400 (Sun, 24 Jun 2007) New Revision: 7520 Added: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ThemeBean.java Removed: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java Log: - renamed ThemeProperyAction -> ThemeBean - attached the ThemeBean to PortalObjectManager - use the editTheme for editing the default theme values of the dashboards Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-06-24 21:17:49 UTC (rev 7519) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-06-24 22:30:34 UTC (rev 7520) @@ -149,6 +149,9 @@ private PortletInvoker portletDefinitionInvoker; /** . */ + private ThemeBean theme; + + /** . */ public PageManagerBean pageManager; // Wired services @@ -343,6 +346,11 @@ return selectedProperties; } + public ThemeBean getTheme() + { + return theme; + } + // UI operations public void selectObject(PortalObject po) @@ -487,6 +495,7 @@ selectedObject = null; selectedProperties = null; controlProperties = null; + theme = null; // if (selectedId == null) @@ -513,6 +522,9 @@ propertyAction = new PropertyAction(this); // + theme = new ThemeBean(selectedObject); + + // Collection pages = getSelectedObject().getChildren(PortalObject.PAGE_MASK); ArrayList list = new ArrayList(pages.size() + 1); for (Iterator iterator = pages.iterator(); iterator.hasNext();) Copied: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ThemeBean.java (from rev 7515, trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java) =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ThemeBean.java (rev 0) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ThemeBean.java 2007-06-24 22:30:34 UTC (rev 7520) @@ -0,0 +1,192 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.core.admin.ui; + +import javax.faces.application.FacesMessage; +import javax.faces.context.FacesContext; +import javax.faces.event.ActionEvent; +import javax.faces.event.AbortProcessingException; + +import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.theme.ThemeConstants; + +/** + * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a> + * @version $Revision: 5448 $ + */ +public class ThemeBean +{ + + /** . */ + private final PortalObject portalObject; + + /** . */ + private String layoutName; + + /** . */ + private String themeName; + + /** . */ + private String renderSetName; + + /** . */ + private String windowRendererName; + + /** . */ + private String decorationRendererName; + + /** . */ + private String portletRendererName; + + + public ThemeBean(PortalObject portalObject) + { + this.portalObject = portalObject; + this.layoutName = portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT); + this.themeName = portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME); + this.renderSetName = portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET); + this.windowRendererName = portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER); + this.decorationRendererName = portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER); + this.portletRendererName = portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER); + } + + public PortalObject getPortalObject() + { + return portalObject; + } + + public String getLayoutName() + { + return layoutName; + } + + public void setLayoutName(String layoutName) + { + this.layoutName = "".equals(layoutName) ? null : layoutName; + } + + public String getThemeName() + { + return themeName; + } + + public void setThemeName(String themeName) + { + this.themeName = "".equals(themeName) ? null : themeName; + } + + public String getRenderSetName() + { + return renderSetName; + } + + public void setRenderSetName(String renderSetName) + { + this.renderSetName = "".equals(renderSetName) ? null : renderSetName; + } + + public String getWindowRendererName() + { + return windowRendererName; + } + + public void setWindowRendererName(String windowRendererName) + { + this.windowRendererName = "".equals(windowRendererName) ? null : windowRendererName; + } + + public String getDecorationRendererName() + { + return decorationRendererName; + } + + public void setDecorationRendererName(String decorationRendererName) + { + this.decorationRendererName = "".equals(decorationRendererName) ? null : decorationRendererName; + } + + public String getPortletRendererName() + { + return portletRendererName; + } + + public void setPortletRendererName(String portletRendererName) + { + this.portletRendererName = "".equals(portletRendererName) ? null : portletRendererName; + } + + public void execute(ActionEvent actionEvent) throws AbortProcessingException + { + boolean successful = true; + + // + switch(portalObject.getType()) + { + case PortalObject.TYPE_CONTEXT: + case PortalObject.TYPE_PORTAL: + case PortalObject.TYPE_PAGE: + portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT, this.layoutName); + portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME, this.themeName); + portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET, this.renderSetName); + break; + case PortalObject.TYPE_WINDOW: + portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER, this.windowRendererName); + portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER, this.decorationRendererName); + portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER, this.portletRendererName); + break; + default: + successful = false; + } + + // + if (successful) + { + String stringMessage = null; + switch(this.portalObject.getType()) + { + case PortalObject.TYPE_PORTAL: + stringMessage = "Theme has been correctly updated on the portal named: " + portalObject.getName(); + break; + case PortalObject.TYPE_PAGE: + stringMessage = "Theme has been correctly updated on the page named: " + portalObject.getName(); + break; + case PortalObject.TYPE_WINDOW: + stringMessage = "Theme has been correctly updated on the window named: " + portalObject.getName(); + break; + } + + // + if (stringMessage != null) + { + FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, stringMessage, stringMessage); + FacesContext.getCurrentInstance().addMessage("status", message); + } + } + else + { + String stringMessage = "Unknown object type, please file a Jira issue: http://jira.jboss.org"; + FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, stringMessage, stringMessage); + FacesContext.getCurrentInstance().addMessage("error", message); + } + } +} Property changes on: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ThemeBean.java ___________________________________________________________________ Name: svn:executable + * Deleted: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java 2007-06-24 21:17:49 UTC (rev 7519) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java 2007-06-24 22:30:34 UTC (rev 7520) @@ -1,191 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.core.admin.ui.actions; - -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; - -import org.jboss.portal.core.model.portal.PortalObject; -import org.jboss.portal.theme.ThemeConstants; - -/** - * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a> - * @version $Revision: 5448 $ - */ -public class ThemePropertyAction -{ - - /** . */ - private PortalObject portalObject; - - /** . */ - private String layoutName; - - /** . */ - private String themeName; - - /** . */ - private String renderSetName; - - /** . */ - private String windowRendererName; - - /** . */ - private String decorationRendererName; - - /** . */ - private String portletRendererName; - - - public PortalObject getPortalObject() - { - return portalObject; - } - - public void setPortalObject(PortalObject portalObject) - { - this.portalObject = portalObject; - this.layoutName = portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT); - this.themeName = portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME); - this.renderSetName = portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET); - this.windowRendererName = portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER); - this.decorationRendererName = portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER); - this.portletRendererName = portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER); - } - - public String getLayoutName() - { - return layoutName; - } - - public String getThemeName() - { - return themeName; - } - - public String getRenderSetName() - { - return renderSetName; - } - - public String getWindowRendererName() - { - return windowRendererName; - } - - public String getDecorationRendererName() - { - return decorationRendererName; - } - - public String getPortletRendererName() - { - return portletRendererName; - } - - public void setLayoutName(String layoutName) - { - this.layoutName = "".equals(layoutName) ? null : layoutName; - } - - public void setThemeName(String themeName) - { - this.themeName = "".equals(themeName) ? null : themeName; - } - - public void setRenderSetName(String renderSetName) - { - this.renderSetName = "".equals(renderSetName) ? null : renderSetName; - } - - public void setWindowRendererName(String windowRendererName) - { - this.windowRendererName = "".equals(windowRendererName) ? null : windowRendererName; - } - - public void setDecorationRendererName(String decorationRendererName) - { - this.decorationRendererName = "".equals(decorationRendererName) ? null : decorationRendererName; - } - - public void setPortletRendererName(String portletRendererName) - { - this.portletRendererName = "".equals(portletRendererName) ? null : portletRendererName; - } - - public String execute() - { - boolean successful = true; - - // - switch(portalObject.getType()) - { - case PortalObject.TYPE_PORTAL: - case PortalObject.TYPE_PAGE: - portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT, this.layoutName); - portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME, this.themeName); - portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET, this.renderSetName); - break; - case PortalObject.TYPE_WINDOW: - portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER, this.windowRendererName); - portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER, this.decorationRendererName); - portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER, this.portletRendererName); - break; - default: - successful = false; - } - - // - if (successful) - { - String stringMessage = null; - switch(this.portalObject.getType()) - { - case PortalObject.TYPE_PORTAL: - stringMessage = "Theme has been correctly updated on the portal named: " + portalObject.getName(); - break; - case PortalObject.TYPE_PAGE: - stringMessage = "Theme has been correctly updated on the page named: " + portalObject.getName(); - break; - case PortalObject.TYPE_WINDOW: - stringMessage = "Theme has been correctly updated on the window named: " + portalObject.getName(); - break; - } - - // - if (stringMessage != null) - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, stringMessage, stringMessage); - FacesContext.getCurrentInstance().addMessage("status", message); - } - } - else - { - String stringMessage = "Unknown object type, please file a Jira issue: http://jira.jboss.org"; - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, stringMessage, stringMessage); - FacesContext.getCurrentInstance().addMessage("error", message); - } - - return "objects"; - } -} Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-06-24 21:17:49 UTC (rev 7519) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-06-24 22:30:34 UTC (rev 7520) @@ -103,15 +103,6 @@ </managed-property> </managed-bean> <managed-bean> - <managed-bean-name>themePropertyAction</managed-bean-name> - <managed-bean-class>org.jboss.portal.core.admin.ui.actions.ThemePropertyAction</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - <managed-property> - <property-name>portalObject</property-name> - <value>#{sessionScope.portalobjectmgr.selectedObject}</value> - </managed-property> - </managed-bean> - <managed-bean> <managed-bean-name>assignContentToWindowAction</managed-bean-name> <managed-bean-class>org.jboss.portal.core.admin.ui.actions.AssignContentToWindowAction</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-06-24 21:17:49 UTC (rev 7519) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-06-24 22:30:34 UTC (rev 7520) @@ -13,7 +13,7 @@ <h:outputLabel for="layout">Layout:</h:outputLabel> </td> <td> - <h:selectOneMenu id="layout" styleClass="portlet-form-field" value="#{themePropertyAction.layoutName}"> + <h:selectOneMenu id="layout" styleClass="portlet-form-field" value="#{theme.layoutName}"> <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> </h:selectOneMenu> </td> @@ -23,7 +23,7 @@ <h:outputLabel for="theme">Theme:</h:outputLabel> </td> <td> - <h:selectOneMenu id="theme" styleClass="portlet-form-field" value="#{themePropertyAction.themeName}"> + <h:selectOneMenu id="theme" styleClass="portlet-form-field" value="#{theme.themeName}"> <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> </h:selectOneMenu> </td> @@ -33,17 +33,17 @@ <h:outputLabel for="renderSet">RenderSet:</h:outputLabel> </td> <td> - <h:selectOneMenu id="renderSet" styleClass="portlet-form-field" value="#{themePropertyAction.renderSetName}"> + <h:selectOneMenu id="renderSet" styleClass="portlet-form-field" value="#{theme.renderSetName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> </h:selectOneMenu> </td> </tr> </tbody> </table> - + <br /> <ui:insert name="form_submit"/> </h:form> -</h:panelGroup> + </h:panelGroup> </div> \ No newline at end of file Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-06-24 21:17:49 UTC (rev 7519) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-06-24 22:30:34 UTC (rev 7520) @@ -14,7 +14,7 @@ <td class="portlet-form-field-label"><label class="portlet-form-field-label">Window Renderer:</label> </td> <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.windowRendererName}"> + <h:selectOneMenu styleClass="portlet-form-field" value="#{theme.windowRendererName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> </h:selectOneMenu> </td> @@ -23,7 +23,7 @@ <td class="portlet-form-field-label"><label class="portlet-form-field-label">Decoration Renderer:</label> </td> <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.decorationRendererName}"> + <h:selectOneMenu styleClass="portlet-form-field" value="#{theme.decorationRendererName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> </h:selectOneMenu> </td> @@ -32,7 +32,7 @@ <td class="portlet-form-field-label"><label class="portlet-form-field-label">Portlet Renderer:</label> </td> <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.portletRendererName}"> + <h:selectOneMenu styleClass="portlet-form-field" value="#{theme.portletRendererName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> </h:selectOneMenu> </td> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-06-24 21:17:49 UTC (rev 7519) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-06-24 22:30:34 UTC (rev 7520) @@ -16,6 +16,13 @@ <ui:param name="properties" value="#{dashboardmgr.controlProperties}"/> </ui:include> + <ui:decorate template="common/editTheme.xhtml"> + <ui:param name="theme" value="#{dashboardmgr.theme}"/> + <ui:define name="form_submit"> + <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" styleClass="portlet-form-button"/> + </ui:define> + </ui:decorate> + </ui:define> </ui:composition> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml 2007-06-24 21:17:49 UTC (rev 7519) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml 2007-06-24 22:30:34 UTC (rev 7520) @@ -7,8 +7,9 @@ <ui:define name="content"> <h3>Page theme properties:</h3> <ui:decorate template="common/editTheme.xhtml"> + <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button"/> <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"> <f:param name="id" value="#{node.id}"/> </h:commandButton> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml 2007-06-24 21:17:49 UTC (rev 7519) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml 2007-06-24 22:30:34 UTC (rev 7520) @@ -11,8 +11,9 @@ <p>The settings defined here will be applied to the whole portal including all the pages and windows unless they have been assigned with different settings</p> <br/> <ui:decorate template="common/editTheme.xhtml"> + <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button"/> <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"> <f:param name="id" value="#{node.id}"/> </h:commandButton> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-06-24 21:17:49 UTC (rev 7519) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-06-24 22:30:34 UTC (rev 7520) @@ -7,8 +7,9 @@ <ui:define name="content"> <h3>Window theme properties:</h3> <ui:decorate template="common/editWindowTheme.xhtml"> + <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button"/> <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"> <f:param name="id" value="#{node.id}"/> </h:commandButton> Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-06-24 21:17:49 UTC (rev 7519) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-06-24 22:30:34 UTC (rev 7520) @@ -57,8 +57,15 @@ /** @see org.jboss.portal.theme.render.renderer.WindowRenderer#render */ public void render(RendererContext rendererContext, WindowRendererContext wrc) throws RenderException { - final DynaRenderOptions regionOptions = (DynaRenderOptions)rendererContext.getAttribute(DynaConstants.RENDER_OPTIONS); + // Get render options + DynaRenderOptions parentOptions = (DynaRenderOptions)rendererContext.getAttribute(DynaConstants.RENDER_OPTIONS); + // It could be null if the parent renderers are not dyna renderers + if (parentOptions == null) + { + parentOptions = DynaRenderOptions.NO_AJAX; + } + // try { @@ -67,14 +74,14 @@ DynaRenderOptions windowOptions = DynaRenderOptions.getOptions(dndValue, partialRefreshValue); // - DynaRenderOptions options = DynaMergeBehavior.mergeForWindow(regionOptions, windowOptions); + DynaRenderOptions options = DynaMergeBehavior.mergeForWindow(parentOptions, windowOptions); rendererContext.setAttribute(DynaConstants.RENDER_OPTIONS, options); // PrintWriter out = rendererContext.getWriter(); // - if (!DynaRenderOptions.NO_AJAX.equals(regionOptions)) + if (!DynaRenderOptions.NO_AJAX.equals(parentOptions)) { out.print("<div class=\"dyna-window\">"); out.print("<div id=\""); @@ -118,7 +125,7 @@ } finally { - rendererContext.setAttribute(DynaConstants.RENDER_OPTIONS, regionOptions); + rendererContext.setAttribute(DynaConstants.RENDER_OPTIONS, parentOptions); } } }