aboutsummaryrefslogtreecommitdiffstats
path: root/server/src
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2014-10-09 15:55:43 +0300
committerVaadin Code Review <review@vaadin.com>2014-10-09 14:34:02 +0000
commitb07484e2578043f8fe20736a33398b242c976d0b (patch)
tree9525c0da514d68ce01b36e6b465f25d0e569ac33 /server/src
parent03bb779d26aa2257de73f479942fdc08fe2926c6 (diff)
downloadvaadin-framework-b07484e2578043f8fe20736a33398b242c976d0b.tar.gz
vaadin-framework-b07484e2578043f8fe20736a33398b242c976d0b.zip
Fix Grid not updating columnOrder on property remove (#13334)
Change-Id: I792499d0bdf3ed2156f10956e2b5af2cb330287c
Diffstat (limited to 'server/src')
-rw-r--r--server/src/com/vaadin/ui/components/grid/Grid.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/components/grid/Grid.java b/server/src/com/vaadin/ui/components/grid/Grid.java
index 745f6fe0a9..bb1c5b6fbc 100644
--- a/server/src/com/vaadin/ui/components/grid/Grid.java
+++ b/server/src/com/vaadin/ui/components/grid/Grid.java
@@ -220,8 +220,9 @@ public class Grid extends AbstractComponent implements SelectionChangeNotifier,
header.removeColumn(columnId);
footer.removeColumn(columnId);
GridColumn column = columns.remove(columnId);
- columnKeys.remove(columnId);
+ getState().columnOrder.remove(columnKeys.key(columnId));
getState().columns.remove(column.getState());
+ columnKeys.remove(columnId);
removeExtension(column.getRenderer());
}
datasourceExtension.propertiesRemoved(removedColumns);