diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-12-04 13:57:47 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-12-05 10:33:52 +0000 |
| commit | c080a93f842b711161df466f3780b52b44300e08 (patch) | |
| tree | e9452f46a77ef0e47d705fdfb52efd220920ce3d /server/src/com/vaadin/data/RpcDataProviderExtension.java | |
| parent | 7ab2d41433fde7284037c1c069500d374e961d66 (diff) | |
| download | vaadin-framework-c080a93f842b711161df466f3780b52b44300e08.tar.gz vaadin-framework-c080a93f842b711161df466f3780b52b44300e08.zip | |
Remove Column visibility setting from server side (#13334)
Change-Id: I2ef97672dd2085e9178f44fce39ead40bd84713c
Diffstat (limited to 'server/src/com/vaadin/data/RpcDataProviderExtension.java')
| -rw-r--r-- | server/src/com/vaadin/data/RpcDataProviderExtension.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/server/src/com/vaadin/data/RpcDataProviderExtension.java b/server/src/com/vaadin/data/RpcDataProviderExtension.java index d607879aa5..6b35ab7f88 100644 --- a/server/src/com/vaadin/data/RpcDataProviderExtension.java +++ b/server/src/com/vaadin/data/RpcDataProviderExtension.java @@ -722,12 +722,16 @@ public class RpcDataProviderExtension extends AbstractExtension { for (Object propertyId : propertyIds) { Column column = grid.getColumn(propertyId); - Object propertyValue = item.getItemProperty(propertyId).getValue(); - JsonValue encodedValue = encodeValue(propertyValue, - column.getRenderer(), column.getConverter(), - grid.getLocale()); - - rowData.put(columnKeys.key(propertyId), encodedValue); + // TODO: Optimize this with Grid.getColumns() 04.12.2014 -Teemu + if (column != null) { + Object propertyValue = item.getItemProperty(propertyId) + .getValue(); + JsonValue encodedValue = encodeValue(propertyValue, + column.getRenderer(), column.getConverter(), + grid.getLocale()); + + rowData.put(columnKeys.key(propertyId), encodedValue); + } } final JsonObject rowObject = Json.createObject(); |