Author: thomas.heute(a)jboss.com Date: 2007-08-16 07:52:20 -0400 (Thu, 16 Aug 2007) New Revision: 7947 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java Log: JBPORTAL-1608: CMS content type always display with no decoration Now the "DecorateContent" attribute only defines a default behavior, but it can be overridden by portal object properties Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2007-08-16 11:27:51 UTC (rev 7946) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2007-08-16 11:52:20 UTC (rev 7947) @@ -213,9 +213,18 @@ if (rendition != null && rendition.getControllerResponse() instanceof MarkupResponse && !getDecorateContent()) { Map props = rendition.getProperties(); - props.put("theme.windowRendererId", "emptyRenderer"); - props.put("theme.decorationRendererId", "emptyRenderer"); - props.put("theme.portletRendererId", "emptyRenderer"); + if (props.get("theme.windowRendererId") == null) + { + props.put("theme.windowRendererId", "emptyRenderer"); + } + if (props.get("theme.decorationRendererId") == null) + { + props.put("theme.decorationRendererId", "emptyRenderer"); + } + if (props.get("theme.portletRendererId") == null) + { + props.put("theme.portletRendererId", "emptyRenderer"); + } } //