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

N°3988 - Investigate small list taking a very long time to load

Browse Source
This commit is contained in:
acognet
2021-04-29 15:00:05 +02:00
parent 6fc3033100
commit 227c90b47f
2 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/dbobject.class.php
View File

@@ -1,20 +1,7 @@
<?php
/**
* Copyright (C) 2013-2021 Combodo SARL
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
/**
@@ -2434,17 +2421,21 @@ abstract class DBObject implements iDisplay
* Reset during {@see DBObject::DBUpdate()}
* @throws Exception
* @uses m_aCurrValues
*/
*/
public function ListChanges()
{
if ($this->m_bIsInDB)
{
if ($this->m_bIsInDB) {
return $this->ListChangedValues($this->m_aCurrValues);
}
return $this->m_aCurrValues;
}
public function GetCurrentValues()
{
return $this->m_aCurrValues;
}
/**
* @api
* @api-advanced

11
sources/Controller/AjaxRenderController.php
View File

@@ -313,13 +313,10 @@ class AjaxRenderController
$aResult["data"] = [];
while ($aObject = $oSet->FetchAssoc()) {
foreach ($aClassAliases as $sAlias => $sClass) {
if (isset($aColumns[$sAlias])) {
foreach ($aColumns[$sAlias] as $sAttCode => $oAttDef) {
if ($sAttCode == "_key_") {
$aObj[$sAlias."/".$sAttCode] = $aObject[$sAlias]->GetKey();
} else {
$aObj[$sAlias."/".$sAttCode] = $aObject[$sAlias]->GetAsHTML($sAttCode);
}
if (isset($aObject[$sAlias])) {
$aObj[$sAlias."/_key_"] = $aObject[$sAlias]->GetKey();
foreach ($aObject[$sAlias]->GetCurrentValues() as $sAttCode => $oAttDef) {
$aObj[$sAlias."/".$sAttCode] = $aObject[$sAlias]->GetAsHTML($sAttCode);
}
}
}