[richfaces-svn-commits] JBoss Rich Faces SVN: r12008 - trunk/ui/dataTable/src/main/java/org/richfaces/renderkit.

[richfaces-svn-commits at lists.jboss.org]

Author: alevkovsky
Date: 2008-12-24 10:50:48 -0500 (Wed, 24 Dec 2008)
New Revision: 12008

Modified:
   trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
https://jira.jboss.org/jira/browse/RF-3019

Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java	2008-12-24 15:11:51 UTC (rev 12007)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java	2008-12-24 15:50:48 UTC (rev 12008)
@@ -44,6 +44,7 @@
 import org.richfaces.component.Column;
 import org.richfaces.component.Row;
 import org.richfaces.component.UIDataTable;
+import org.richfaces.component.util.FormUtil;
 import org.richfaces.component.util.ViewUtil;
 import org.richfaces.model.Ordering;
 import org.richfaces.renderkit.html.iconimages.DataTableIconSortAsc;
@@ -150,7 +151,14 @@
 		ResponseWriter writer = context.getResponseWriter();
 		UIComponent header = table.getHeader();
 		boolean columnFacetPresent = isColumnFacetPresent(table, "header");
-		boolean isFilterByPresent = isHeaderFactoryColumnAttributePresent(table, "filterBy");
+		boolean isFilterByPresent = isHeaderFactoryColumnAttributePresent(table, "filterBy");		
+		boolean isSortingPresent = isHeaderFactoryColumnAttributePresent(table, "sortBy")
+			|| isHeaderFactoryColumnAttributePresent(table, "comparator");
+
+		if (isFilterByPresent || isSortingPresent) {
+			FormUtil.throwEnclFormReqExceptionIfNeed(context, table);
+		}
+		
 		Iterator<UIComponent> colums = table.columns();