[richfaces-svn-commits] JBoss Rich Faces SVN: r5966 - in trunk/ui/dataTable/src/main: java/org/richfaces/component and 1 other directory.

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

Author: konstantin.mishin
Date: 2008-02-08 13:58:01 -0500 (Fri, 08 Feb 2008)
New Revision: 5966

Modified:
   trunk/ui/dataTable/src/main/config/component/column.xml
   trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
Log:
RF-1741

Modified: trunk/ui/dataTable/src/main/config/component/column.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/column.xml	2008-02-08 18:52:58 UTC (rev 5965)
+++ trunk/ui/dataTable/src/main/config/component/column.xml	2008-02-08 18:58:01 UTC (rev 5966)
@@ -98,6 +98,16 @@
 			<returntype>boolean</returntype>
 			<description></description>
 		</property>		
+		<property elonly="true">
+			<name>filterBy</name>
+			<classname>java.lang.Object</classname>
+			<description></description>
+		</property>		
+		<property hidden="true">
+			<name>filterValue</name>
+			<classname>java.lang.String</classname>
+			<description></description>
+		</property>		
 		
 		<!--
 		<property>

Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java	2008-02-08 18:52:58 UTC (rev 5965)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java	2008-02-08 18:58:01 UTC (rev 5966)
@@ -39,6 +39,7 @@
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.iterators.FilterIterator;
 import org.apache.commons.collections.iterators.IteratorChain;
+import org.richfaces.model.ExtendedFilterField;
 import org.richfaces.model.FilterField;
 import org.richfaces.model.ModifiableModel;
 import org.richfaces.model.Ordering;
@@ -182,6 +183,11 @@
 				if (filterMethod != null) {
 					filterFields.add(new FilterField(filterMethod));
 				}
+				ValueExpression filterBy = component.getValueExpression("filterBy");
+				String filterValue = (String)component.getAttributes().get("filterValue");
+				if (filterBy != null) {
+					filterFields.add(new ExtendedFilterField(filterBy, filterValue));
+				}
 				if (column.isSortable() && !Ordering.UNSORTED.equals(column.getSortOrder())) {
 					ValueExpression sortExpression = component.getValueExpression("sortExpression");
 					if (sortExpression != null) {