From ed3f08b0385fba7a28269cacd3f20c62e303769f Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Mon, 30 Nov 2015 13:39:28 +0200 Subject: Fix select all checkbox state update with low row count (#19322) Change-Id: Ifbaeb2db18ecb6657ae839fec90dbfcaa99be4ac --- server/src/com/vaadin/ui/Grid.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java index c75013b8c6..e1c7e894a3 100644 --- a/server/src/com/vaadin/ui/Grid.java +++ b/server/src/com/vaadin/ui/Grid.java @@ -1862,8 +1862,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, } private void updateAllSelectedState() { - if (getState().allSelected != selection.size() >= selectionLimit) { - getState().allSelected = selection.size() >= selectionLimit; + int totalRowCount = getParentGrid().datasource.size(); + int rows = Math.min(totalRowCount, selectionLimit); + if (getState().allSelected != selection.size() >= rows) { + getState().allSelected = selection.size() >= rows; } } -- cgit v1.2.3