composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert layout changes from 11f6c88 as they break dashlet table

Browse Source
This commit is contained in:
Stephen Abello
2021-06-18 13:54:54 +02:00
parent bc4f384948
commit e905838733
3 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/base/components/datatable/layout.ready.js.twig
View File

@@ -41,8 +41,8 @@ var oTable{{ sListIDForVarSuffix }} = $('#{{ oUIBlock.GetId() }}').DataTable({
},
scrollX: true,
{% if oUIBlock.GetOption('sMaxHeight') is not empty %}
scrollY: {{ oUIBlock.GetOption('sMaxHeight') }},
scrollCollapse: true,
scrollY: "{{ oUIBlock.GetOption('sMaxHeight') }}",
scrollCollapse: true,
{% endif %}
lengthMenu: [[ {{ iPageSize }}, {{ iPageSize*2 }}, {{ iPageSize*3 }}, {{ iPageSize*4 }}, -1], [ {{ iPageSize }}, {{ iPageSize*2 }}, {{ iPageSize*3 }}, {{ iPageSize*4 }}, "{{ 'UI:Datatables:Language:DisplayLength:All'|dict_s }}"]],
dom: "<'ibo-datatable--toolbar'<'ibo-datatable--toolbar-left' pl><'ibo-datatable--toolbar-right' i>>t<'ibo-datatable--toolbar'<'ibo-datatable--toolbar-left' pl><'ibo-datatable--toolbar-right' i>>",

26
templates/base/components/datatable/static/formtable/layout.ready.js.twig
View File

@@ -7,9 +7,6 @@ var table{{ sListIDForVarSuffix }} = $('#{{ oUIBlock.GetId() }}').DataTable({
},
scrollX: true,
scrollCollapse: true,
{% if oUIBlock.GetOption('sMaxHeight') is not empty %}
scrollY: {{ oUIBlock.GetOption('sMaxHeight') }},
{% endif %}
paging: false,
filter: false,
autoWidth: false,
@@ -29,34 +26,27 @@ var table{{ sListIDForVarSuffix }} = $('#{{ oUIBlock.GetId() }}').DataTable({
{% endif %}
drawCallback: function () {
// Hiding pagination if only one page
if ($(this).closest('.dataTables_wrapper').find('.dataTables_paginate:last .paginate_button:not(.previous):not(.next)').length < 2)
{
if ($(this).closest('.dataTables_wrapper').find('.dataTables_paginate:last .paginate_button:not(.previous):not(.next)').length < 2) {
$(this).closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info').hide();
}
else
{
} else {
$(this).closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info').show();
}
},
createdRow: function (row, data, dataIndex) {
if (data['@class'] !== undefined)
{
createdRow: function( row, data, dataIndex ) {
if (data['@class'] !== undefined) {
$(row).addClass(data['@class']);
}
},
});
if ($('#{{ oUIBlock.GetId() }}').find('thead').is(':visible'))
{
if ($('#{{ oUIBlock.GetId() }}').find('thead').is(':visible')) {
table{{ sListIDForVarSuffix }}.columns.adjust().draw();
}
if (window.ResizeObserver)
{
if(window.ResizeObserver){
let oFromTable{{ sListIDForVarSuffix }}ResizeTimeout = null;
const oFromTable{{ sListIDForVarSuffix }}Resize = new ResizeObserver(function () {
const oFromTable{{ sListIDForVarSuffix }}Resize = new ResizeObserver(function(){
clearTimeout(oFromTable{{ sListIDForVarSuffix }}ResizeTimeout);
oFromTable{{ sListIDForVarSuffix }}ResizeTimeout = setTimeout(function () {
oFromTable{{ sListIDForVarSuffix }}ResizeTimeout = setTimeout(function(){
$('#{{ oUIBlock.GetId() }}').DataTable().columns.adjust();
}, 120);
});

4
templates/base/components/datatable/static/layout.ready.js.twig
View File

@@ -31,8 +31,8 @@ $('#{{ oUIBlock.GetId() }}').DataTable({
},
scrollX: true,
{% if oUIBlock.GetOption('sMaxHeight') is not empty %}
scrollY: {{ oUIBlock.GetOption('sMaxHeight') }},
scrollCollapse: true,
scrollY: "{{ oUIBlock.GetOption('sMaxHeight') }}",
scrollCollapse: true,
{% endif %}
order: [],
autoWidth: false,