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

N°4051 Make sure js dependencies are met before resuming ajax calls js code

Browse Source
This commit is contained in:
Stephen Abello
2021-06-10 15:05:39 +02:00
parent 679542eaaa
commit bcfdf76b71
3 changed files with 132 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/application/WebPage/AjaxPage.php
View File

@@ -24,6 +24,8 @@ class AjaxPage extends WebPage implements iTabbedPage
protected $s_dict_scripts;
const DEFAULT_PAGE_TEMPLATE_REL_PATH = 'pages/backoffice/ajaxpage/layout';
/** @var string */
private $sPromiseId;
/**
* constructor for the web page
@@ -43,6 +45,7 @@ class AjaxPage extends WebPage implements iTabbedPage
$this->sContentType = 'text/html';
$this->sContentDisposition = 'inline';
$this->m_sMenu = "";
$this->sPromiseId = utils::ReadParam('ajax_promise_id', uniqid('ajax_', true));
utils::InitArchiveMode();
}
@@ -205,6 +208,7 @@ class AjaxPage extends WebPage implements iTabbedPage
'sSanitizedContent' => utils::FilterXSS($this->s_content),
'sDeferredContent' => utils::FilterXSS(addslashes(str_replace("\n", '', $this->s_deferred_content))),
'sCapturedOutput' => utils::FilterXSS($s_captured_output),
'sPromiseId' => $this->sPromiseId
];
$oTwigEnv = TwigHelper::GetTwigEnvironment(BlockRenderer::TWIG_BASE_PATH, BlockRenderer::TWIG_ADDITIONAL_PATHS);