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

Merge remote-tracking branch 'origin/develop' into feature/8772_form_dependencies_manager

Browse Source
This commit is contained in:
Eric Espie
2025-11-14 16:08:37 +01:00
parent b9d905ad1b b5fe12ca3c
commit ea95ae60a6
2221 changed files with 56572 additions and 61991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sources/Renderer/BlockRenderer.php
View File

@@ -1,4 +1,5 @@
<?php
/**
* Copyright (C) 2013-2024 Combodo SAS
*
@@ -136,8 +137,7 @@ class BlockRenderer
public function RenderHtml()
{
$sOutput = '';
if(!empty($this->oBlock->GetHtmlTemplateRelPath()))
{
if (!empty($this->oBlock->GetHtmlTemplateRelPath())) {
$sOutput = TwigHelper::RenderTemplate(
static::$oTwigEnv,
$this->GetTemplateParameters(),
@@ -164,8 +164,7 @@ class BlockRenderer
public function RenderJsInline(string $sType)
{
$sOutput = '';
if(!empty($this->oBlock->GetJsTemplatesRelPath($sType)))
{
if (!empty($this->oBlock->GetJsTemplatesRelPath($sType))) {
$sOutput = TwigHelper::RenderTemplate(
static::$oTwigEnv,
$this->GetTemplateParameters(),
@@ -179,8 +178,7 @@ class BlockRenderer
public function RenderJsInlineRecursively(UIBlock $oBlock, string $sType)
{
$sOutput = '';
if(!empty($oBlock->GetJsTemplatesRelPath($sType)))
{
if (!empty($oBlock->GetJsTemplatesRelPath($sType))) {
$sOutput = trim(TwigHelper::RenderTemplate(
static::$oTwigEnv,
array_merge(['oUIBlock' => $oBlock], $this->aContextParams, $oBlock->GetParameters()),
@@ -188,8 +186,8 @@ class BlockRenderer
$sType
));
}
foreach ($oBlock->GetSubBlocks() as $oSubBlock){
$sOutput = $sOutput . $this->RenderJsInlineRecursively($oSubBlock, $sType);
foreach ($oBlock->GetSubBlocks() as $oSubBlock) {
$sOutput = $sOutput.$this->RenderJsInlineRecursively($oSubBlock, $sType);
}
return trim($sOutput);
@@ -204,8 +202,7 @@ class BlockRenderer
public function RenderCssInline()
{
$sOutput = '';
if(!empty($this->oBlock->GetCssTemplateRelPath()))
{
if (!empty($this->oBlock->GetCssTemplateRelPath())) {
$sOutput = TwigHelper::RenderTemplate(
static::$oTwigEnv,
$this->GetTemplateParameters(),