composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-25 11:38:44 +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:
Pierre Goiffon
2022-08-29 13:50:34 +02:00
parent 9a9707e15c 9c57b0b1b7
commit ef07f8366d
19 changed files with 84 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sources/Application/UI/Base/Component/FieldBadge/FieldBadgeUIBlockFactory.php
View File

@@ -10,6 +10,7 @@ namespace Combodo\iTop\Application\UI\Base\Component\FieldBadge;
use Combodo\iTop\Application\UI\Base\AbstractUIBlockFactory;
use ormStyle;
use utils;
/**
* Class FieldBadgeUIBlockFactory
@@ -36,6 +37,10 @@ class FieldBadgeUIBlockFactory extends AbstractUIBlockFactory
{
$oBadge = null;
$sHtml = '';
// N°5318 - Sanitize value manually as this UIBlock is not using a proper TWIG template 😥
$sValueForHtml = utils::EscapeHtml($sValue);
if ($oStyle) {
$sStyleClass = $oStyle->GetStyleClass();
$sPrimaryColor = $oStyle->GetMainColor();
@@ -47,12 +52,12 @@ class FieldBadgeUIBlockFactory extends AbstractUIBlockFactory
if (!is_null($sDecorationClasses) && !empty($sDecorationClasses)) {
$sHtml .= "<span class=\"ibo-field-badge--decoration\"><i class=\"$sDecorationClasses\"></i></span>";
}
$sHtml .= "<span class=\"ibo-field-badge--label\">$sValue</span>";
$sHtml .= "<span class=\"ibo-field-badge--label\">$sValueForHtml</span>";
}
}
if (!$oBadge) {
$oBadge = new FieldBadge();
$sHtml .= "<span>$sValue</span>";
$sHtml .= "<span>$sValueForHtml</span>";
}
$oBadge->AddHtml($sHtml);
return $oBadge;