diff --git a/module/common/view/datatable.html.php b/module/common/view/datatable.html.php index 0c381a9d83..402f87651f 100644 --- a/module/common/view/datatable.html.php +++ b/module/common/view/datatable.html.php @@ -58,6 +58,7 @@ $(document).ready(function() if(!this.multiKey && !$(e.target).closest('td[data-index="0"]').length) return false; } }, + fixedHeader: true, ready: function() { if(!this.$table) return; diff --git a/www/js/my.full.js b/www/js/my.full.js index 7df55e50b2..7b04cd6d98 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -1434,12 +1434,18 @@ function checkOnlybodyPage() */ function fixedTfootAction(formID) { - if($(formID).size() == 0) return false; - if($(formID).find('table:last').find('tfoot').size() == 0) return false; + var $form = $(formID); + if(!$form.length) return false; + var $table = $form.find('table:last'); + var $tfoot = $table.find('tfoot'); + if($table.hasClass('table-datatable')) + { + $table = $form.find('.datatable-rows'); + $tfoot = $form.find('.datatable-footer tfoot'); + } + if(!$tfoot.length) return false; - var $table = $(formID).find('table:last'), - $tfoot = $table.find('tfoot'), - $tbody = $table.find('tbody'), + var $tbody = $table.find('tbody'), $inputGroup = $tfoot.find('.table-actions').children('.input-group'), pageFooterHeight = $('#footer').height(), tableWidth,