You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2017/07/25 14:17:08 UTC
svn commit: r1802946 -
/myfaces/tobago/branches/tobago-2.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
Author: weber
Date: Tue Jul 25 14:17:07 2017
New Revision: 1802946
URL: http://svn.apache.org/viewvc?rev=1802946&view=rev
Log:
TOBAGO-1770 - Tobago 2: Sheet sorting works not as expected
Modified:
myfaces/tobago/branches/tobago-2.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
Modified: myfaces/tobago/branches/tobago-2.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-2.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java?rev=1802946&r1=1802945&r2=1802946&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-2.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java (original)
+++ myfaces/tobago/branches/tobago-2.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java Tue Jul 25 14:17:07 2017
@@ -122,7 +122,7 @@ public class Sorter {
} else {
final boolean descending = !sheetState.isAscending();
- final ValueExpression expression = child.getValueExpression("value");
+ final ValueExpression expression = child.getValueExpression(attributeName);
actualComparator = new ValueExpressionComparator(facesContext, var, expression, descending, comparator);
}
} else {
@@ -235,13 +235,13 @@ public class Sorter {
// look for a better component if any
}
if (child instanceof UIOutput) {
- break;
+ return child;
}
if (child instanceof UICommand
|| child instanceof javax.faces.component.UIPanel) {
child = getFirstSortableChild(child.getChildren());
if (child instanceof UIOutput) {
- break;
+ return child;
}
}
}