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

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source
This commit is contained in:
Eric Espie
2024-09-11 17:34:34 +02:00
parent c1aa013053 47c05b75d0
commit 61b247b156
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
datamodels/2.x/itop-hub-connector/ajax.php
View File

@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
use Combodo\iTop\Application\WebPage\AjaxPage;
use Combodo\iTop\Application\WebPage\JsonPage;
require_once(APPROOT.'application/utils.inc.php');
require_once(APPROOT.'core/log.class.inc.php');
@@ -110,14 +110,15 @@ function DoBackup($sTargetFile)
*/
function ReportStatus($sMessage, $bSuccess, $iErrorCode = 0, $aMoreFields = array())
{
$oPage = new AjaxPage("");
$oPage->SetContentType('application/json');
// Do not use AjaxPage during setup phases, because it uses InterfaceDiscovery in Twig compilation
$oPage = new JsonPage();
$aResult = array(
'code' => $iErrorCode,
'message' => $sMessage,
'fields' => $aMoreFields
);
$oPage->add(json_encode($aResult));
$oPage->SetData($aResult);
$oPage->SetOutputDataOnly(true);
$oPage->output();
}