Author: konstantin.mishin Date: 2011-03-09 13:20:11 -0500 (Wed, 09 Mar 2011) New Revision: 22126 Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java Log: RF-10685 Reviewer: Nick Belaevski Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java 2011-03-09 18:17:53 UTC (rev 22125) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java 2011-03-09 18:20:11 UTC (rev 22126) @@ -59,7 +59,6 @@ columnNumber++; } } - encodeRowEnd(writer); } public RowHolderBase createRowHolder(FacesContext context, UIComponent component, Object[] options) { Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java =================================================================== --- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2011-03-09 18:17:53 UTC (rev 22125) +++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2011-03-09 18:20:11 UTC (rev 22126) @@ -181,8 +181,26 @@ partialStart(facesContext, id); } + if (!isSubtable && !parentTbodyStart && !tbodyStart) { + encodeTableBodyStart(writer, facesContext, dataTable); + rowHolder.setRowStart(true); + tbodyStart = true; + } + child.encodeAll(facesContext); + if (!isSubtable) { + encodeRowEnd(writer); + if (!components.hasNext()) { + if (!parentTbodyStart && tbodyStart) { + encodeTableBodyEnd(writer); + tbodyStart = false; + } + } + rowHolder.setRowStart(true); + rowHolder.resetProcessCell(); + } + if (isSubtable && partialUpdate) { partialEnd(facesContext); }