fixed #7057 - Table state not working when reorderableColumns being f…

…alse
primefaces · Jan 2, 2019 · e256305 · e256305
1 parent d450d19
commit e256305
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/app/components/table/table.ts b/src/app/components/table/table.ts
@@ -476,7 +476,7 @@ export class Table implements OnInit, AfterViewInit, AfterContentInit, Blockable
         this._columns = cols;
         this.tableService.onColumnsChange(cols);
 
-        if (this._columns && this.isStateful() && !this.columnOrderStateRestored) {
+        if (this._columns && this.isStateful() && this.reorderableColumns && !this.columnOrderStateRestored ) {
             this.restoreColumnOrder();
         }
     }
@@ -2038,14 +2038,12 @@ export class Table implements OnInit, AfterViewInit, AfterContentInit, Blockable
         if (stateString) {
             let state: TableState = JSON.parse(stateString);
             let columnOrder = state.columnOrder;
-            let reorderedColumns = [];
-
             if (columnOrder) {
+                let reorderedColumns = [];
                 columnOrder.map(key => reorderedColumns.push(this.findColumnByKey(key)));
+                this.columnOrderStateRestored = true;
+                this.columns = reorderedColumns;
             }
-
-            this.columnOrderStateRestored = true;
-            this.columns = reorderedColumns;
         }
     }