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

Merge branch 'develop' into SessionManagement

Browse Source
This commit is contained in:
Eric Espie
2021-09-07 16:33:10 +02:00
parent 2aaac00015 3c081461b0
commit eef3e9b7ae
75 changed files with 1018 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sources/application/TwigBase/Controller/Controller.php
View File

@@ -379,10 +379,17 @@ abstract class Controller
}
$aParams = array_merge($this->GetDefaultParameters(), $aParams);
$this->CreatePage($sPageType);
$this->AddToPage($this->RenderTemplate($aParams, $sTemplateName, 'html'));
$this->AddScriptToPage($this->RenderTemplate($aParams, $sTemplateName, 'js'));
$this->AddReadyScriptToPage($this->RenderTemplate($aParams, $sTemplateName, 'ready.js'));
$this->AddStyleToPage($this->RenderTemplate($aParams, $sTemplateName, 'css'));
$sHTMLContent = $this->RenderTemplate($aParams, $sTemplateName, 'html');
$this->AddToPage($sHTMLContent);
$sJSScript = $this->RenderTemplate($aParams, $sTemplateName, 'js');
$this->AddScriptToPage($sJSScript);
$sReadyScript = $this->RenderTemplate($aParams, $sTemplateName, 'ready.js');
$this->AddReadyScriptToPage($sReadyScript);
$sStyle = $this->RenderTemplate($aParams, $sTemplateName, 'css');
$this->AddStyleToPage($sStyle);
if (strlen($sHTMLContent) == 0 && strlen($sJSScript) == 0 && strlen($sReadyScript) == 0 && strlen($sStyle) == 0) {
IssueLog::Error("Missing TWIG template for $sTemplateName");
}
if (!empty($this->m_aAjaxTabs)) {
$this->m_oPage->AddTabContainer('TwigBaseTabContainer');
$this->m_oPage->SetCurrentTabContainer('TwigBaseTabContainer');