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

N°3648 - Fix "Configure this list..."

Browse Source
This commit is contained in:
Eric
2021-03-04 15:37:13 +01:00
parent 88e502ad7a
commit 5ccd229092
5 changed files with 80 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sources/Controller/AjaxRenderController.php
View File

@@ -167,6 +167,12 @@ class AjaxRenderController
}
}
}
if (!isset($aExtraParams['list_id'])) {
$sListId = utils::ReadParam('list_id', null);
if (!is_null($sListId)) {
$aExtraParams['list_id'] = $sListId;
}
}
$iLength = utils::ReadParam('end', 10);
$aColumns = utils::ReadParam('columns', array(), false, 'raw_data');
$sSelectMode = utils::ReadParam('select_mode', '');
@@ -318,7 +324,9 @@ class AjaxRenderController
if ($sIdName != "") {
$aObj["id"] = $aObj[$sIdName];
}
array_push($aResult["data"], $aObj);
if (isset($aObj)) {
array_push($aResult["data"], $aObj);
}
}
return $aResult;
@@ -350,7 +358,7 @@ class AjaxRenderController
if ($bSaveAsDefaults) {
if ($sTableId != null) {
$oCurrSettings = unserialize(DataTableSettings::GetTableSettings($aClassAliases, $sTableId, true /* bOnlyTable */));
$oCurrSettings = DataTableSettings::GetTableSettings($aClassAliases, $sTableId, true /* bOnlyTable */);
if ($oCurrSettings) {
$oCurrSettings->ResetToDefault(false); // Reset this table to the defaults
}