composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-17 22:39:03 +02: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:
lenaick.moreira
2026-03-25 17:56:19 +01:00
parent 347663f8f7 511dabe2b0
commit 11afd23087
7 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/setuppage.class.inc.php
View File

@@ -36,6 +36,8 @@ class SetupPage extends NiceWebPage
{
public const DEFAULT_PAGE_TEMPLATE_REL_PATH = 'pages/backoffice/setuppage/layout';
protected const BODY_DATA_GUI_TYPE = 'setup';
public function __construct($sTitle)
{
parent::__construct($sTitle);

1
sources/Application/WebPage/AjaxPage.php
View File

@@ -218,6 +218,7 @@ class AjaxPage extends WebPage implements iTabbedPage
'aJsInlineLive' => $this->a_scripts,
'aJsInlineOnDomReady' => $this->GetReadyScripts(),
'aJsInlineOnInit' => $this->a_init_scripts,
'sBodyDataGuiType' => static::BODY_DATA_GUI_TYPE,
'bEscapeContent' => ($this->sContentType == 'text/html') && ($this->sContentDisposition == 'inline'),
// TODO 3.0.0: TEMP, used while developping, remove it.
'sSanitizedContent' => utils::FilterXSS($this->s_content),

1
sources/Application/WebPage/UnauthenticatedWebPage.php
View File

@@ -172,6 +172,7 @@ class UnauthenticatedWebPage extends NiceWebPage
'aJsInlineLive' => $this->a_scripts,
'aJsInlineOnDomReady' => $this->GetReadyScripts(),
'aJsInlineOnInit' => $this->a_init_scripts,
'sBodyDataGuiType' => static::BODY_DATA_GUI_TYPE,
// TODO 3.0.0: TEMP, used while developing, remove it.
'sCapturedOutput' => utils::FilterXSS($s_captured_output),

3
sources/Application/WebPage/WebPage.php
View File

@@ -152,6 +152,8 @@ class WebPage implements Page
*/
public const DEFAULT_PAGE_TEMPLATE_REL_PATH = 'pages/backoffice/webpage/layout';
protected const BODY_DATA_GUI_TYPE = 'backoffice';
protected $s_title;
protected $s_content;
protected $s_deferred_content;
@@ -1566,6 +1568,7 @@ JS;
'aJsInlineLive' => $this->a_scripts,
'aJsInlineOnDomReady' => $this->GetReadyScripts(),
'aJsInlineOnInit' => $this->a_init_scripts,
'sBodyDataGuiType' => static::BODY_DATA_GUI_TYPE,
// TODO 3.0.0: TEMP, used while developing, remove it.
'sCapturedOutput' => utils::FilterXSS($s_captured_output),

1
sources/Application/WebPage/iTopWebPage.php
View File

@@ -929,6 +929,7 @@ HTML;
'aJsInlineOnInit' => $this->a_init_scripts,
'aJsInlineOnDomReady' => $this->GetReadyScripts(),
'aJsInlineLive' => $this->a_scripts,
'sBodyDataGuiType' => static::BODY_DATA_GUI_TYPE,
// TODO 3.0.0: TEMP, used while developping, remove it.
'sSanitizedContent' => utils::FilterXSS($this->s_content),
'sDeferredContent' => utils::FilterXSS($this->s_deferred_content),

2
templates/pages/backoffice/webpage/layout.html.twig
View File

@@ -49,7 +49,7 @@
{% endfor %}
{% endblock %}
</head>
<body data-gui-type="backoffice">
<body data-gui-type="{{ aPage.sBodyDataGuiType|default('backoffice') }}">
{% if aPage.isPrintable %}<div class="printable-content" style="width: 27.7cm;">{% endif %}
{% block iboPageBodyHtml %}
<div id="ibo-page-container">

2
tests/ci_description.ini
View File

@@ -1,6 +1,6 @@
[infra]
; STS version : testing greatest PHP version possible
php_version=8.3-apache
php_version=8.4-apache
; N°6629 perf bug on some tests on mariadb for now, so specifying MySQL
db_version=latest-mariadb