Browse Source

#5374 additional fix: handle actions correctly if column reordering is disabled.

svn changeset:14311/svn branch:6.4
tags/6.7.0.beta1
Henri Sara 14 years ago
parent
commit
509b247db3
1 changed files with 2 additions and 1 deletions
  1. 2
    1
      src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java

+ 2
- 1
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java View File

@@ -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

Loading…
Cancel
Save