diff --git a/public/js/grocy.js b/public/js/grocy.js
index 4d5b79d1..2c12bdec 100644
--- a/public/js/grocy.js
+++ b/public/js/grocy.js
@@ -734,7 +734,7 @@ $.extend(true, $.fn.dataTable.defaults, {
return JSON.parse(Grocy.UserSettings[settingKey]);
}
},
- "preDrawCallback": function(settings)
+ 'preDrawCallback': function(settings)
{
//currently it is not possible to save the state of rowGroup via saveState events
var api = new $.fn.dataTable.Api(settings);
@@ -770,7 +770,10 @@ $.extend(true, $.fn.dataTable.defaults, {
},
'columnDefs': [
{ type: 'chinese-string', targets: '_all' }
- ]
+ ],
+ 'rowGroup': {
+ enable: false
+ }
});
// serializeJSON defaults
diff --git a/public/viewjs/productform.js b/public/viewjs/productform.js
index 3d402fb4..3d0db6a5 100644
--- a/public/viewjs/productform.js
+++ b/public/viewjs/productform.js
@@ -293,6 +293,7 @@ var quConversionsTable = $('#qu-conversions-table-products').DataTable({
{ 'visible': false, 'targets': 4 }
].concat($.fn.dataTable.defaults.columnDefs),
'rowGroup': {
+ enable: true,
dataSrc: 4
}
});
diff --git a/public/viewjs/recipeform.js b/public/viewjs/recipeform.js
index 0df9a397..4833dac5 100644
--- a/public/viewjs/recipeform.js
+++ b/public/viewjs/recipeform.js
@@ -82,6 +82,7 @@ var recipesPosTables = $('#recipes-pos-table').DataTable({
{ 'visible': false, 'targets': 4 }
].concat($.fn.dataTable.defaults.columnDefs),
'rowGroup': {
+ enable: true,
dataSrc: 4
}
});
diff --git a/public/viewjs/shoppinglist.js b/public/viewjs/shoppinglist.js
index 35fb577b..084b7438 100644
--- a/public/viewjs/shoppinglist.js
+++ b/public/viewjs/shoppinglist.js
@@ -9,6 +9,7 @@ var shoppingListTable = $('#shoppinglist-table').DataTable({
{ 'visible': false, 'targets': 3 }
].concat($.fn.dataTable.defaults.columnDefs),
'rowGroup': {
+ enable: true,
dataSrc: 3,
startRender: function(rows, group)
{
diff --git a/public/viewjs/tasks.js b/public/viewjs/tasks.js
index 29cdb4e7..0f28445b 100644
--- a/public/viewjs/tasks.js
+++ b/public/viewjs/tasks.js
@@ -6,6 +6,7 @@
{ 'visible': false, 'targets': 3 }
].concat($.fn.dataTable.defaults.columnDefs),
'rowGroup': {
+ enable: true,
dataSrc: 3
}
});
diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php
index 173b20f8..9c4d1238 100644
--- a/views/layout/default.blade.php
+++ b/views/layout/default.blade.php
@@ -65,6 +65,8 @@
rel="stylesheet">
+
-
-
+
+
+
+
@@ -746,4 +750,4 @@
@endif