[richfaces-svn-commits] JBoss Rich Faces SVN: r16100 - in branches/community/3.3.X: ui/dataTable/src/main/java/org/richfaces/renderkit and 1 other directory.
Author: Alex.Kolonitsky
Date: 2009-12-09 14:58:49 -0500 (Wed, 09 Dec 2009)
New Revision: 16100
Added:
branches/community/3.3.X/samples/dataTableDemo/src/main/webapp/pages/RF-8192.jsp
Modified:
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
RF-8192 - dataTables: change default header facet for sorting generation
the only thing I did -- I have reverted prev fix
If need more please let me know
Added: branches/community/3.3.X/samples/dataTableDemo/src/main/webapp/pages/RF-8192.jsp
===================================================================
--- branches/community/3.3.X/samples/dataTableDemo/src/main/webapp/pages/RF-8192.jsp
(rev 0)
+++
branches/community/3.3.X/samples/dataTableDemo/src/main/webapp/pages/RF-8192.jsp 2009-12-09
19:58:49 UTC (rev 16100)
@@ -0,0 +1,28 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/dataTable"
prefix="data" %>
+<html>
+<head>
+ <title></title>
+ <style>
+ .dataTable .rich-sort-icon {
+ display: none;
+ }
+ </style>
+</head>
+<body>
+<f:view>
+ <a4j:form>
+ <data:dataTable value="#{data.mounths}" var="entry">
+ <data:column selfSorted="false"
sortBy="#{entry.mounth}" sortOrder="DESCENDING">
+ <h:outputText value="#{entry.mounth}"/>
+ </data:column>
+ <data:column>
+ <h:outputText value="#{entry.total}"/>
+ </data:column>
+ </data:dataTable>
+ </a4j:form>
+</f:view>
+</body>
+</html>
Modified:
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
---
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-12-09
19:43:09 UTC (rev 16099)
+++
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-12-09
19:58:49 UTC (rev 16100)
@@ -169,8 +169,8 @@
UIComponent header = table.getHeader();
boolean isEncodeHeaders = isColumnFacetPresent(table, "header") ||
- isHeaderFactoryColumnAttributePresent(table, "sortBy") ||
- isHeaderFactoryColumnAttributePresent(table, "comparator") ||
+// isHeaderFactoryColumnAttributePresent(table, "sortBy") ||
+// isHeaderFactoryColumnAttributePresent(table, "comparator") ||
isHeaderFactoryColumnAttributePresent(table, "filterBy");
if (header != null || isEncodeHeaders) {
@@ -457,7 +457,6 @@
/**
* Calculate total number of columns in table.
*
- * @param context
* @param table
* @return
*/