composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 02:28:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3787 - Use data loader for auto refresh

Browse Source
This commit is contained in:
acognet
2021-03-11 10:35:19 +01:00
parent fe5d5f3869
commit e376f13263
2 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
js/dataTables.pipeline.js
View File

@@ -30,22 +30,33 @@ $.fn.dataTable.pipeline = function (opts) {
if (this.find('tbody').find('td').length == 0) {
this.find('tbody').append('<tr class="ibo-dataTables--processing"><td>&#160;</td></tr>');
this.find('tbody').append('<tr class="ibo-dataTables--processing"><td>&#160;</td></tr>');
this.find('tbody').block({
message: message,
css: {
border: '0px '
}
});
this.find('thead').block({
message: '',
css: {
border: '0px '
}
});
} else {
this.find('tbody').block({
message: '',
css: {
border: '0px '
}
});
this.find('thead').block({
message: message,
css: {
border: '0px ',
top: '20px',
}
});
}
this.find('tbody').block({
message: message,
css: {
border: '0px ',
top: '20px',
}
});
this.find('thead').block({
message: message,
css: {
border: '0px ',
top: '20px',
}
});
var ajax = false;
var requestStart = request.start;
var drawStart = request.start;

5
sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
View File

@@ -108,7 +108,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
{
if (!isset($aExtraParams['menu']) || $aExtraParams['menu']) {
$oMenuBlock = new MenuBlock($oSet->GetFilter(), $sStyle);
$aExtraParams['sRefreshAction'] = $oDataTable->GetJSRefresh()[0];
$aExtraParams['sRefreshAction'] = $oDataTable->GetJSRefresh();
$oBlockMenu = $oMenuBlock->GetRenderContent($oPage, $aExtraParams, $sListId);
} else {
$bToolkitMenu = true;
@@ -386,12 +386,13 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
$aOptions['iPageSize'] = $oCustomSettings->iDefaultPageSize;
}
$aOptions['processing'] = true;
$aOptions['sTableId'] = $sTableId;
$aOptions['bUseCustomSettings'] = $bUseCustomSettings;
$aOptions['bViewLink'] = $bViewLink;
$aOptions['sListId'] = $sListId;
$aOptions['oClassAliases'] = json_encode($aClassAliases);
if (isset($aExtraParams['selected_rows']) && !empty($aExtraParams['selected_rows'])){
if (isset($aExtraParams['selected_rows']) && !empty($aExtraParams['selected_rows'])) {
$aOptions['sSelectedRows'] = json_encode($aExtraParams['selected_rows']);
} else {
$aOptions['sSelectedRows'] = '[]';