diff options
| -rwxr-xr-x | client/src/main/java/com/vaadin/client/widgets/Grid.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java index 5c3978c6a3..e51d8d57fc 100755 --- a/client/src/main/java/com/vaadin/client/widgets/Grid.java +++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java @@ -1677,9 +1677,12 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, if (grid.selectionColumn != null && grid.selectionColumn .getRenderer() instanceof MultiSelectionRenderer) { grid.refreshBody(); - CheckBox checkBox = (CheckBox) grid.getDefaultHeaderRow() + HeaderCell cell = grid.getDefaultHeaderRow().getCell(grid.selectionColumn); + if (cell.getType() == GridStaticCellType.WIDGET) { // if lazy provider, then no checkbox + CheckBox checkBox = (CheckBox) grid.getDefaultHeaderRow() .getCell(grid.selectionColumn).getWidget(); - checkBox.setEnabled(isEnabled); + checkBox.setEnabled(isEnabled); + } } } |