Merge branch 'develop' into webpack

2018-12-09 14:25:52 +02:00
parent 816a963308 42a357f863
commit eed11e33f3
180 changed files with 4187 additions and 404 deletions
@@ -80,6 +80,10 @@ function (PaginationService, DatatableService, EndpointProvider) {
    }
  };

+  this.onTextFilterChange = function() {
+    DatatableService.setDataTableTextFilters(this.tableKey, this.state.textFilter);
+  };
+
  this.onColumnVisibilityChange = function()  {
    DatatableService.setColumnVisibilitySettings(this.tableKey, this.columnVisibility);
  };
@@ -229,6 +233,11 @@ function (PaginationService, DatatableService, EndpointProvider) {
      this.columnVisibility = storedColumnVisibility;
    }
    this.columnVisibility.state.open = false;
+
+    var textFilter = DatatableService.getDataTableTextFilters(this.tableKey);
+    if (textFilter !== null) {
+      this.state.textFilter = textFilter;
+    }
  };

  function setDefaults(ctrl) {