Fixed primefaces#3026

mertsincan · mertsincan · commit c695c3a7a6da · 2017-12-01T12:25:57.000+03:00
diff --git a/src/main/java/org/primefaces/component/datatable/DataTableRenderer.java b/src/main/java/org/primefaces/component/datatable/DataTableRenderer.java
@@ -695,8 +695,10 @@ else if (sortOrder.equals(SortOrder.DESCENDING)) {
     }
 
     protected String resolveDefaultSortIcon(DataTable table, UIColumn column, String sortOrder) {
+        ValueExpression tableSortByVE = table.getValueExpression(DataTable.PropertyKeys.sortBy.toString());
         String field = table.resolveColumnField(column);
         String sortField = table.getSortField();
+        sortField = (sortField == null && tableSortByVE != null) ? table.resolveStaticField(tableSortByVE) : sortField;
         String sortIcon = null;
 
         if (sortField != null && field != null && sortField.equals(field)) {

Original file line number	Diff line number	Diff line change
`@@ -695,8 +695,10 @@ else if (sortOrder.equals(SortOrder.DESCENDING)) {`
`695`	`695`	`}`
`696`	`696`
`697`	`697`	`protected String resolveDefaultSortIcon(DataTable table, UIColumn column, String sortOrder) {`
	`698`	`+ ValueExpression tableSortByVE = table.getValueExpression(DataTable.PropertyKeys.sortBy.toString());`
`698`	`699`	`String field = table.resolveColumnField(column);`
`699`	`700`	`String sortField = table.getSortField();`
	`701`	`+ sortField = (sortField == null && tableSortByVE != null) ? table.resolveStaticField(tableSortByVE) : sortField;`
`700`	`702`	`String sortIcon = null;`
`701`	`703`
`702`	`704`	`if (sortField != null && field != null && sortField.equals(field)) {`