diff --git a/changelog/55_UNRELEASED_2019-xx-xx.md b/changelog/55_UNRELEASED_2019-xx-xx.md index 9027446c..a4be6368 100644 --- a/changelog/55_UNRELEASED_2019-xx-xx.md +++ b/changelog/55_UNRELEASED_2019-xx-xx.md @@ -28,6 +28,7 @@ - New endpoints for the stock transfer & stock entry edit capabilities mentioned above ### General & other improvements/fixes +- Fixed that also the first column (where in most tables only buttons/menus are displayed) in tables was searched when using the general search field - 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 & search performance (thanks @lwis) - For integration: If a `GET` parameter `closeAfterCreation` is passed to the product edit page, the window will be closed on save (due to Browser restrictions, this only works when the window was opened from JavaScript) (thanks @Forceu) diff --git a/public/viewjs/batteries.js b/public/viewjs/batteries.js index d08d143b..893e8ed9 100644 --- a/public/viewjs/batteries.js +++ b/public/viewjs/batteries.js @@ -1,7 +1,8 @@ var batteriesTable = $('#batteries-table').DataTable({ 'order': [[1, 'asc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ], }); $('#batteries-table tbody').removeClass("d-none"); diff --git a/public/viewjs/batteriesjournal.js b/public/viewjs/batteriesjournal.js index 0466b4d1..6b20ff02 100644 --- a/public/viewjs/batteriesjournal.js +++ b/public/viewjs/batteriesjournal.js @@ -2,7 +2,8 @@ 'paginate': true, 'order': [[1, 'desc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#batteries-journal-table tbody').removeClass("d-none"); diff --git a/public/viewjs/batteriesoverview.js b/public/viewjs/batteriesoverview.js index ef462f67..f08e8a92 100644 --- a/public/viewjs/batteriesoverview.js +++ b/public/viewjs/batteriesoverview.js @@ -1,7 +1,8 @@ var batteriesOverviewTable = $('#batteries-overview-table').DataTable({ 'order': [[2, 'desc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#batteries-overview-table tbody').removeClass("d-none"); diff --git a/public/viewjs/chores.js b/public/viewjs/chores.js index 848c9259..8c600cf6 100644 --- a/public/viewjs/chores.js +++ b/public/viewjs/chores.js @@ -1,7 +1,8 @@ var choresTable = $('#chores-table').DataTable({ 'order': [[1, 'asc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#chores-table tbody').removeClass("d-none"); diff --git a/public/viewjs/choresjournal.js b/public/viewjs/choresjournal.js index c80e495f..7ca81ea8 100644 --- a/public/viewjs/choresjournal.js +++ b/public/viewjs/choresjournal.js @@ -2,7 +2,8 @@ 'paginate': true, 'order': [[1, 'desc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#chores-journal-table tbody').removeClass("d-none"); diff --git a/public/viewjs/choresoverview.js b/public/viewjs/choresoverview.js index 33428010..65019c93 100644 --- a/public/viewjs/choresoverview.js +++ b/public/viewjs/choresoverview.js @@ -1,7 +1,8 @@ var choresOverviewTable = $('#chores-overview-table').DataTable({ 'order': [[2, 'desc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#chores-overview-table tbody').removeClass("d-none"); diff --git a/public/viewjs/locations.js b/public/viewjs/locations.js index ec4a089f..09b0d3ed 100644 --- a/public/viewjs/locations.js +++ b/public/viewjs/locations.js @@ -1,7 +1,8 @@ var locationsTable = $('#locations-table').DataTable({ 'order': [[1, 'asc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#locations-table tbody').removeClass("d-none"); diff --git a/public/viewjs/manageapikeys.js b/public/viewjs/manageapikeys.js index 79de8144..5017b2cc 100644 --- a/public/viewjs/manageapikeys.js +++ b/public/viewjs/manageapikeys.js @@ -1,7 +1,8 @@ var apiKeysTable = $('#apikeys-table').DataTable({ 'order': [[4, 'desc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#apikeys-table tbody').removeClass("d-none"); diff --git a/public/viewjs/productform.js b/public/viewjs/productform.js index 4be401d7..1990cef4 100644 --- a/public/viewjs/productform.js +++ b/public/viewjs/productform.js @@ -354,6 +354,7 @@ var quConversionsTable = $('#qu-conversions-table').DataTable({ "orderFixed": [[3, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 }, { 'visible': false, 'targets': 3 } ], 'rowGroup': { diff --git a/public/viewjs/productgroups.js b/public/viewjs/productgroups.js index 618b2671..d935977b 100644 --- a/public/viewjs/productgroups.js +++ b/public/viewjs/productgroups.js @@ -1,7 +1,8 @@ var groupsTable = $('#productgroups-table').DataTable({ 'order': [[1, 'asc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#productgroups-table tbody').removeClass("d-none"); diff --git a/public/viewjs/products.js b/public/viewjs/products.js index 97c3b8c6..2a040a7d 100644 --- a/public/viewjs/products.js +++ b/public/viewjs/products.js @@ -1,7 +1,8 @@ var productsTable = $('#products-table').DataTable({ 'order': [[1, 'asc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#products-table tbody').removeClass("d-none"); diff --git a/public/viewjs/quantityunitform.js b/public/viewjs/quantityunitform.js index f6044b40..a2017b1c 100644 --- a/public/viewjs/quantityunitform.js +++ b/public/viewjs/quantityunitform.js @@ -116,7 +116,8 @@ $('#quantityunit-form input').keydown(function(event) var quConversionsTable = $('#qu-conversions-table').DataTable({ 'order': [[1, 'asc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#qu-conversions-table tbody').removeClass("d-none"); diff --git a/public/viewjs/quantityunits.js b/public/viewjs/quantityunits.js index b4ad2a45..bb7ba589 100644 --- a/public/viewjs/quantityunits.js +++ b/public/viewjs/quantityunits.js @@ -1,7 +1,8 @@ var quantityUnitsTable = $('#quantityunits-table').DataTable({ 'order': [[1, 'asc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#quantityunits-table tbody').removeClass("d-none"); diff --git a/public/viewjs/recipeform.js b/public/viewjs/recipeform.js index c146fb11..78cfdb40 100644 --- a/public/viewjs/recipeform.js +++ b/public/viewjs/recipeform.js @@ -66,6 +66,7 @@ var recipesPosTables = $('#recipes-pos-table').DataTable({ "orderFixed": [[4, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 }, { 'visible': false, 'targets': 4 } ], 'rowGroup': { @@ -78,7 +79,8 @@ recipesPosTables.columns.adjust().draw(); var recipesIncludesTables = $('#recipes-includes-table').DataTable({ 'order': [[1, 'asc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#recipes-includes-table tbody').removeClass("d-none"); diff --git a/public/viewjs/shoppinglist.js b/public/viewjs/shoppinglist.js index e7b93afa..2991b6a6 100644 --- a/public/viewjs/shoppinglist.js +++ b/public/viewjs/shoppinglist.js @@ -3,6 +3,7 @@ "orderFixed": [[3, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 }, { 'visible': false, 'targets': 3 } ], 'rowGroup': { diff --git a/public/viewjs/stockdetail.js b/public/viewjs/stockdetail.js index ab871201..3cba3c47 100644 --- a/public/viewjs/stockdetail.js +++ b/public/viewjs/stockdetail.js @@ -2,6 +2,7 @@ 'order': [[2, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ], }); $('#stock-detail-table tbody').removeClass("d-none"); diff --git a/public/viewjs/stockjournal.js b/public/viewjs/stockjournal.js index 4e5f6ae0..af3ad490 100644 --- a/public/viewjs/stockjournal.js +++ b/public/viewjs/stockjournal.js @@ -2,7 +2,8 @@ 'paginate': true, 'order': [[3, 'desc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#stock-journal-table tbody').removeClass("d-none"); diff --git a/public/viewjs/stockoverview.js b/public/viewjs/stockoverview.js index 645e2ac9..4047f197 100644 --- a/public/viewjs/stockoverview.js +++ b/public/viewjs/stockoverview.js @@ -2,6 +2,7 @@ 'order': [[3, 'asc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 }, { 'visible': false, 'targets': 4 }, { 'visible': false, 'targets': 5 }, { 'visible': false, 'targets': 6 } diff --git a/public/viewjs/taskcategories.js b/public/viewjs/taskcategories.js index 396ba8f0..16732e64 100644 --- a/public/viewjs/taskcategories.js +++ b/public/viewjs/taskcategories.js @@ -1,7 +1,8 @@ var categoriesTable = $('#taskcategories-table').DataTable({ 'order': [[1, 'asc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#taskcategories-table tbody').removeClass("d-none"); diff --git a/public/viewjs/tasks.js b/public/viewjs/tasks.js index 3dbd6d30..f270445f 100644 --- a/public/viewjs/tasks.js +++ b/public/viewjs/tasks.js @@ -2,6 +2,7 @@ 'order': [[2, 'desc']], 'columnDefs': [ { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 }, { 'visible': false, 'targets': 3 } ], 'rowGroup': { diff --git a/public/viewjs/userentities.js b/public/viewjs/userentities.js index a9b3a24e..c26dc1b9 100644 --- a/public/viewjs/userentities.js +++ b/public/viewjs/userentities.js @@ -1,7 +1,8 @@ var userentitiesTable = $('#userentities-table').DataTable({ 'order': [[1, 'asc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#userentities-table tbody').removeClass("d-none"); diff --git a/public/viewjs/userfields.js b/public/viewjs/userfields.js index f9823a00..648126d7 100644 --- a/public/viewjs/userfields.js +++ b/public/viewjs/userfields.js @@ -1,7 +1,8 @@ var userfieldsTable = $('#userfields-table').DataTable({ 'order': [[1, 'asc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#userfields-table tbody').removeClass("d-none"); diff --git a/public/viewjs/userobjects.js b/public/viewjs/userobjects.js index 0f96bed1..5b348e1a 100644 --- a/public/viewjs/userobjects.js +++ b/public/viewjs/userobjects.js @@ -1,7 +1,8 @@ var userobjectsTable = $('#userobjects-table').DataTable({ 'order': [[1, 'asc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#userobjects-table tbody').removeClass("d-none"); diff --git a/public/viewjs/users.js b/public/viewjs/users.js index 64e9019c..b3961be5 100644 --- a/public/viewjs/users.js +++ b/public/viewjs/users.js @@ -1,7 +1,8 @@ var usersTable = $('#users-table').DataTable({ 'order': [[1, 'asc']], 'columnDefs': [ - { 'orderable': false, 'targets': 0 } + { 'orderable': false, 'targets': 0 }, + { 'searchable': false, "targets": 0 } ] }); $('#users-table tbody').removeClass("d-none");