From 9e1804252e0b22f004076df497d0193593598464 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Tue, 15 Oct 2019 19:38:51 +0200 Subject: [PATCH] Centralize default DataTables init settings (references #424) --- changelog/55_UNRELEASED_2019-xx-xx.md | 1 + public/js/grocy.js | 19 +++++++++++++++++ public/viewjs/batteries.js | 14 ------------- public/viewjs/batteriesjournal.js | 15 +------------- public/viewjs/batteriesoverview.js | 16 +------------- public/viewjs/chores.js | 16 +------------- public/viewjs/choresjournal.js | 15 +------------- public/viewjs/choresoverview.js | 16 +------------- public/viewjs/equipment.js | 14 ------------- public/viewjs/locations.js | 16 +------------- public/viewjs/manageapikeys.js | 16 +------------- public/viewjs/productform.js | 14 ------------- public/viewjs/productgroups.js | 16 +------------- public/viewjs/products.js | 16 +------------- public/viewjs/quantityunitform.js | 16 +------------- public/viewjs/quantityunits.js | 16 +------------- public/viewjs/recipeform.js | 30 +-------------------------- public/viewjs/recipes.js | 14 ------------- public/viewjs/shoppinglist.js | 14 ------------- public/viewjs/stockjournal.js | 15 +------------- public/viewjs/stockoverview.js | 16 -------------- public/viewjs/taskcategories.js | 16 +------------- public/viewjs/tasks.js | 14 ------------- public/viewjs/userentities.js | 16 +------------- public/viewjs/userfields.js | 16 +------------- public/viewjs/userobjects.js | 16 +------------- public/viewjs/users.js | 16 +------------- 27 files changed, 38 insertions(+), 381 deletions(-) diff --git a/changelog/55_UNRELEASED_2019-xx-xx.md b/changelog/55_UNRELEASED_2019-xx-xx.md index e3e04439..11594942 100644 --- a/changelog/55_UNRELEASED_2019-xx-xx.md +++ b/changelog/55_UNRELEASED_2019-xx-xx.md @@ -3,3 +3,4 @@ ### General & other fixes - Fixed that the meal plan menu entry (sidebar) was not visible when the calendar was disabled (`FEATURE_FLAG_CALENDAR`) (thanks @lwis) +- Slightly optimized table loading performance (thanks @lwis) diff --git a/public/js/grocy.js b/public/js/grocy.js index f9319198..7ee410ad 100644 --- a/public/js/grocy.js +++ b/public/js/grocy.js @@ -625,3 +625,22 @@ $(document).on("click", ".show-as-dialog-link", function(e) } }); }); + +// Default DataTables initialisation settings +$.extend(true, $.fn.dataTable.defaults, { + 'paginate': false, + 'deferRender': true, + 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, + 'scrollY': false, + 'colReorder': true, + 'stateSave': true, + 'stateSaveParams': function (settings, data) + { + data.search.search = ""; + + data.columns.forEach(column => + { + column.search.search = ""; + }); + } +}); diff --git a/public/viewjs/batteries.js b/public/viewjs/batteries.js index 0b6de32e..a47c5721 100644 --- a/public/viewjs/batteries.js +++ b/public/viewjs/batteries.js @@ -1,22 +1,8 @@ var batteriesTable = $('#batteries-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } }); $('#batteries-table tbody').removeClass("d-none"); batteriesTable.columns.adjust().draw(); diff --git a/public/viewjs/batteriesjournal.js b/public/viewjs/batteriesjournal.js index fbcaf465..2ece1e0f 100644 --- a/public/viewjs/batteriesjournal.js +++ b/public/viewjs/batteriesjournal.js @@ -3,20 +3,7 @@ 'order': [[1, 'desc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#batteries-journal-table tbody').removeClass("d-none"); batteriesJournalTable.columns.adjust().draw(); diff --git a/public/viewjs/batteriesoverview.js b/public/viewjs/batteriesoverview.js index 6381c36e..c1ddf62a 100644 --- a/public/viewjs/batteriesoverview.js +++ b/public/viewjs/batteriesoverview.js @@ -1,22 +1,8 @@ var batteriesOverviewTable = $('#batteries-overview-table').DataTable({ - 'paginate': false, 'order': [[2, 'desc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#batteries-overview-table tbody').removeClass("d-none"); batteriesOverviewTable.columns.adjust().draw(); diff --git a/public/viewjs/chores.js b/public/viewjs/chores.js index 4c28637c..c7e3a075 100644 --- a/public/viewjs/chores.js +++ b/public/viewjs/chores.js @@ -1,22 +1,8 @@ var choresTable = $('#chores-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#chores-table tbody').removeClass("d-none"); choresTable.columns.adjust().draw(); diff --git a/public/viewjs/choresjournal.js b/public/viewjs/choresjournal.js index 6b9e0aeb..34a8b812 100644 --- a/public/viewjs/choresjournal.js +++ b/public/viewjs/choresjournal.js @@ -3,20 +3,7 @@ 'order': [[1, 'desc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#chores-journal-table tbody').removeClass("d-none"); choresJournalTable.columns.adjust().draw(); diff --git a/public/viewjs/choresoverview.js b/public/viewjs/choresoverview.js index 0d226a82..3469292a 100644 --- a/public/viewjs/choresoverview.js +++ b/public/viewjs/choresoverview.js @@ -1,22 +1,8 @@ var choresOverviewTable = $('#chores-overview-table').DataTable({ - 'paginate': false, 'order': [[2, 'desc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#chores-overview-table tbody').removeClass("d-none"); choresOverviewTable.columns.adjust().draw(); diff --git a/public/viewjs/equipment.js b/public/viewjs/equipment.js index f9198cf9..334f4cf1 100644 --- a/public/viewjs/equipment.js +++ b/public/viewjs/equipment.js @@ -1,19 +1,5 @@ var equipmentTable = $('#equipment-table').DataTable({ - 'paginate': false, 'order': [[0, 'asc']], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - }, 'select': 'single', 'initComplete': function() { diff --git a/public/viewjs/locations.js b/public/viewjs/locations.js index c34b2917..73d1a499 100644 --- a/public/viewjs/locations.js +++ b/public/viewjs/locations.js @@ -1,22 +1,8 @@ var locationsTable = $('#locations-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#locations-table tbody').removeClass("d-none"); locationsTable.columns.adjust().draw(); diff --git a/public/viewjs/manageapikeys.js b/public/viewjs/manageapikeys.js index 87bcc489..bae833ea 100644 --- a/public/viewjs/manageapikeys.js +++ b/public/viewjs/manageapikeys.js @@ -1,22 +1,8 @@ var apiKeysTable = $('#apikeys-table').DataTable({ - 'paginate': false, 'order': [[4, 'desc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#apikeys-table tbody').removeClass("d-none"); apiKeysTable.columns.adjust().draw(); diff --git a/public/viewjs/productform.js b/public/viewjs/productform.js index eb81f018..ee803124 100644 --- a/public/viewjs/productform.js +++ b/public/viewjs/productform.js @@ -334,26 +334,12 @@ if (Grocy.EditMode === 'create') } var quConversionsTable = $('#qu-conversions-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], "orderFixed": [[3, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 }, { 'visible': false, 'targets': 3 } ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - }, 'rowGroup': { dataSrc: 3 } diff --git a/public/viewjs/productgroups.js b/public/viewjs/productgroups.js index eedfb88b..ab5a8a7b 100644 --- a/public/viewjs/productgroups.js +++ b/public/viewjs/productgroups.js @@ -1,22 +1,8 @@ var groupsTable = $('#productgroups-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#productgroups-table tbody').removeClass("d-none"); groupsTable.columns.adjust().draw(); diff --git a/public/viewjs/products.js b/public/viewjs/products.js index 9eb97d66..d82b7fd0 100644 --- a/public/viewjs/products.js +++ b/public/viewjs/products.js @@ -1,22 +1,8 @@ var productsTable = $('#products-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#products-table tbody').removeClass("d-none"); productsTable.columns.adjust().draw(); diff --git a/public/viewjs/quantityunitform.js b/public/viewjs/quantityunitform.js index ddb29f0a..f6044b40 100644 --- a/public/viewjs/quantityunitform.js +++ b/public/viewjs/quantityunitform.js @@ -114,24 +114,10 @@ $('#quantityunit-form input').keydown(function(event) }); var quConversionsTable = $('#qu-conversions-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#qu-conversions-table tbody').removeClass("d-none"); quConversionsTable.columns.adjust().draw(); diff --git a/public/viewjs/quantityunits.js b/public/viewjs/quantityunits.js index fd66b740..4dd7c9db 100644 --- a/public/viewjs/quantityunits.js +++ b/public/viewjs/quantityunits.js @@ -1,22 +1,8 @@ var quantityUnitsTable = $('#quantityunits-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#quantityunits-table tbody').removeClass("d-none"); quantityUnitsTable.columns.adjust().draw(); diff --git a/public/viewjs/recipeform.js b/public/viewjs/recipeform.js index 5a632036..334f0418 100644 --- a/public/viewjs/recipeform.js +++ b/public/viewjs/recipeform.js @@ -62,26 +62,12 @@ }); var recipesPosTables = $('#recipes-pos-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], "orderFixed": [[4, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 }, { 'visible': false, 'targets': 4 } ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - }, 'rowGroup': { dataSrc: 4 } @@ -90,24 +76,10 @@ $('#recipes-pos-table tbody').removeClass("d-none"); recipesPosTables.columns.adjust().draw(); var recipesIncludesTables = $('#recipes-includes-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function (settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#recipes-includes-table tbody').removeClass("d-none"); recipesIncludesTables.columns.adjust().draw(); diff --git a/public/viewjs/recipes.js b/public/viewjs/recipes.js index 64f0b502..129030b5 100644 --- a/public/viewjs/recipes.js +++ b/public/viewjs/recipes.js @@ -1,22 +1,8 @@ var recipesTables = $('#recipes-table').DataTable({ - 'paginate': false, 'order': [[0, 'asc']], 'columnDefs': [ { 'orderData': 2, 'targets': 1 } ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - }, 'select': 'single', 'initComplete': function() { diff --git a/public/viewjs/shoppinglist.js b/public/viewjs/shoppinglist.js index 5006a4e6..0d5b09c4 100644 --- a/public/viewjs/shoppinglist.js +++ b/public/viewjs/shoppinglist.js @@ -1,24 +1,10 @@ var shoppingListTable = $('#shoppinglist-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], "orderFixed": [[3, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 }, { 'visible': false, 'targets': 3 } ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - }, 'rowGroup': { dataSrc: 3 } diff --git a/public/viewjs/stockjournal.js b/public/viewjs/stockjournal.js index 0a730061..57f47da7 100644 --- a/public/viewjs/stockjournal.js +++ b/public/viewjs/stockjournal.js @@ -3,20 +3,7 @@ 'order': [[3, 'desc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#stock-journal-table tbody').removeClass("d-none"); stockJournalTable.columns.adjust().draw(); diff --git a/public/viewjs/stockoverview.js b/public/viewjs/stockoverview.js index c252d905..1b578aa3 100644 --- a/public/viewjs/stockoverview.js +++ b/public/viewjs/stockoverview.js @@ -1,7 +1,4 @@ var stockOverviewTable = $('#stock-overview-table').DataTable({ - 'paginate': false, - 'deferRender': true, - 'searchDelay': 200, 'order': [[3, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 }, @@ -9,19 +6,6 @@ { 'visible': false, 'targets': 5 }, { 'visible': false, 'targets': 6 } ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } }); $('#stock-overview-table tbody').removeClass("d-none"); stockOverviewTable.columns.adjust().draw(); diff --git a/public/viewjs/taskcategories.js b/public/viewjs/taskcategories.js index 197facf4..fad51bb0 100644 --- a/public/viewjs/taskcategories.js +++ b/public/viewjs/taskcategories.js @@ -1,22 +1,8 @@ var categoriesTable = $('#taskcategories-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#taskcategories-table tbody').removeClass("d-none"); categoriesTable.columns.adjust().draw(); diff --git a/public/viewjs/tasks.js b/public/viewjs/tasks.js index 58e0391e..4043786b 100644 --- a/public/viewjs/tasks.js +++ b/public/viewjs/tasks.js @@ -1,23 +1,9 @@ var tasksTable = $('#tasks-table').DataTable({ - 'paginate': false, 'order': [[2, 'desc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 }, { 'visible': false, 'targets': 3 } ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - }, 'rowGroup': { dataSrc: 3 } diff --git a/public/viewjs/userentities.js b/public/viewjs/userentities.js index 417933b1..4094a32e 100644 --- a/public/viewjs/userentities.js +++ b/public/viewjs/userentities.js @@ -1,22 +1,8 @@ var userentitiesTable = $('#userentities-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#userentities-table tbody').removeClass("d-none"); userentitiesTable.columns.adjust().draw(); diff --git a/public/viewjs/userfields.js b/public/viewjs/userfields.js index 331755ec..5fe77008 100644 --- a/public/viewjs/userfields.js +++ b/public/viewjs/userfields.js @@ -1,22 +1,8 @@ var userfieldsTable = $('#userfields-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#userfields-table tbody').removeClass("d-none"); userfieldsTable.columns.adjust().draw(); diff --git a/public/viewjs/userobjects.js b/public/viewjs/userobjects.js index a51e31b5..82c6fd28 100644 --- a/public/viewjs/userobjects.js +++ b/public/viewjs/userobjects.js @@ -1,22 +1,8 @@ var userobjectsTable = $('#userobjects-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#userobjects-table tbody').removeClass("d-none"); userobjectsTable.columns.adjust().draw(); diff --git a/public/viewjs/users.js b/public/viewjs/users.js index e882f5f3..0f6554ef 100644 --- a/public/viewjs/users.js +++ b/public/viewjs/users.js @@ -1,22 +1,8 @@ var usersTable = $('#users-table').DataTable({ - 'paginate': false, 'order': [[1, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 } - ], - 'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { }, - 'scrollY': false, - 'colReorder': true, - 'stateSave': true, - 'stateSaveParams': function(settings, data) - { - data.search.search = ""; - - data.columns.forEach(column => - { - column.search.search = ""; - }); - } + ] }); $('#users-table tbody').removeClass("d-none"); usersTable.columns.adjust().draw();