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

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

Author: alevkovsky
Date: 2009-01-20 06:23:18 -0500 (Tue, 20 Jan 2009)
New Revision: 12345

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

Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java	2009-01-20 11:10:31 UTC (rev 12344)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java	2009-01-20 11:23:18 UTC (rev 12345)
@@ -151,14 +151,7 @@
 		ResponseWriter writer = context.getResponseWriter();
 		UIComponent header = table.getHeader();
 		boolean columnFacetPresent = isColumnFacetPresent(table, "header");
-		boolean isFilterByPresent = isHeaderFactoryColumnAttributePresent(table, "filterBy");		
-		boolean isSortingPresent = isHeaderFactoryColumnAttributePresent(table, "sortBy")
-			|| isHeaderFactoryColumnAttributePresent(table, "comparator");
-
-		if (isFilterByPresent || isSortingPresent) {
-			FormUtil.throwEnclFormReqExceptionIfNeed(context, table);
-		}
-		
+		boolean isFilterByPresent = isHeaderFactoryColumnAttributePresent(table, "filterBy");
 		Iterator<UIComponent> colums = table.columns();
 		
 		
@@ -693,6 +686,7 @@
 				writer.writeAttribute("id", clientId, null);
 				
 				if (sortableColumn && col.isSelfSorted()) {
+					FormUtil.throwEnclFormReqExceptionIfNeed(context, column.getParent());
 					writer.writeAttribute(HTML.onclick_ATTRIBUTE, buildAjaxFunction(context, column, true)
 							.toString(), null);
 					writer.writeAttribute(HTML.style_ATTRIBUTE, "cursor: pointer;", null);