fixes #618

svn changeset:1277/svn branch:trunk

diff --git a/src/com/itmill/toolkit/ui/Table.java b/src/com/itmill/toolkit/ui/Table.java
index ba40c43574eb8e5821286a3bd5a86037f5955073..96d821be664632621d33c06dc1f97ac9293e0025 100644 (file)
--- a/src/com/itmill/toolkit/ui/Table.java
+++ b/src/com/itmill/toolkit/ui/Table.java
@@ -1293,20 +1293,22 @@ public class Table extends Select implements Action.Container,
 
                // Sorting
                boolean doSort = false;
-               if (variables.containsKey("sortcolumn")) {
-                       String colId = (String) variables.get("sortcolumn");
-                       if (colId != null && !"".equals(colId) && !"null".equals(colId)) {
-                               Object id = this.columnIdMap.get(colId);
-                               setSortContainerPropertyId(id);
-                               doSort = true;
+               if(!this.sortDisabled) {
+                       if (variables.containsKey("sortcolumn")) {
+                               String colId = (String) variables.get("sortcolumn");
+                               if (colId != null && !"".equals(colId) && !"null".equals(colId)) {
+                                       Object id = this.columnIdMap.get(colId);
+                                       setSortContainerPropertyId(id);
+                                       doSort = true;
+                               }
                        }
-               }
-               if (variables.containsKey("sortascending")) {
-                       boolean state = ((Boolean) variables.get("sortascending"))
-                                       .booleanValue();
-                       if (state != this.sortAscending) {
-                               setSortAscending(state);
-                               doSort = true;
+                       if (variables.containsKey("sortascending")) {
+                               boolean state = ((Boolean) variables.get("sortascending"))
+                                               .booleanValue();
+                               if (state != this.sortAscending) {
+                                       setSortAscending(state);
+                                       doSort = true;
+                               }
                        }
                }
                if (doSort)