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

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

Browse Source
This commit is contained in:
acognet
2022-03-16 09:44:33 +01:00
parent f4ecdf116a ea043960ff
commit 1db4b9a12e
77 changed files with 604 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pages/ajax.render.php
View File

@@ -888,6 +888,9 @@ try
break;
case 'import_dashboard':
$oPage = new JsonPage();
$oPage->SetOutputDataOnly(true);
$sTransactionId = utils::ReadParam('transaction_id', '', false, 'transaction_id');
if (!utils::IsTransactionValid($sTransactionId, true))
{
@@ -916,7 +919,7 @@ try
{
$aResult['error'] = 'Dashboard id="'.$sDashboardId.'" not found.';
}
$oPage->add(json_encode($aResult));
$oPage->SetData($aResult);
break;
case 'toggle_dashboard':
@@ -1851,7 +1854,8 @@ EOF
// Save the generated PDF as an attachment
$sPDF = $oPage->get_pdf();
$oPage = new AjaxPage('');
$oPage = new JsonPage();
$oPage->SetOutputDataOnly(true);
$oAttachment = MetaModel::NewObject('Attachment');
$oAttachment->Set('item_class', $sObjClass);
$oAttachment->Set('item_id', $iObjKey);
@@ -1862,7 +1866,7 @@ EOF
'status' => 'ok',
'att_id' => $iAttachmentId,
);
$oPage->add(json_encode($aRet));
$oPage->SetData($aRet);
}
break;
@@ -2040,10 +2044,14 @@ EOF
break;
case 'export_build':
$oPage = new JsonPage();
$oPage->SetOutputDataOnly(true);
$oAjaxRenderController->ExportBuild($oPage, false);
break;
case 'export_build_portal':
$oPage = new JsonPage();
$oPage->SetOutputDataOnly(true);
$oAjaxRenderController->ExportBuild($oPage, true);
break;
@@ -2163,6 +2171,9 @@ EOF
break;
case 'cke_img_upload':
$oPage = new JsonPage();
$oPage->SetOutputDataOnly(true);
// Image uploaded via CKEditor
$aResult = array(
'uploaded' => 0,
@@ -2233,7 +2244,7 @@ EOF
$aResult['error'] = $e->GetMessage();
}
}
$oPage->add(json_encode($aResult));
$oPage->SetData($aResult);
break;
/** @noinspection PhpMissingBreakStatementInspection cke_upload_and_browse and cke_browse are chained */
@@ -2632,7 +2643,8 @@ EOF
// Navigation menu
//--------------------------------
case 'get_menus_count':
$oPage = new JsonPage();
$oPage->SetOutputDataOnly(true);
$oAjaxRenderController->GetMenusCount($oPage);
break;