diff options
| author | Henri Sara <henri.sara@itmill.com> | 2010-07-23 09:05:21 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2010-07-23 09:05:21 +0000 |
| commit | 509b247db34080bb4eb5760806ec800add308d8b (patch) | |
| tree | d604602f889fa60163602a24bde3ab9948507deb /src/com | |
| parent | c31964254b63538e1af503272101c326e925aa7d (diff) | |
| download | vaadin-framework-509b247db34080bb4eb5760806ec800add308d8b.tar.gz vaadin-framework-509b247db34080bb4eb5760806ec800add308d8b.zip | |
#5374 additional fix: handle actions correctly if column reordering is disabled.
svn changeset:14311/svn branch:6.4
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index 96af63c739..5072f8df77 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -716,6 +716,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, columnOrder = uidl.getStringArrayVariable("columnorder"); } else { columnReordering = false; + columnOrder = null; } if (uidl.hasVariable("collapsedcolumns")) { @@ -2434,7 +2435,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, */ public Action[] getActions() { Object[] cols; - if (columnReordering) { + if (columnReordering && columnOrder != null) { cols = columnOrder; } else { // if columnReordering is disabled, we need different way to get |