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

Fix JS file handling, add TODO for what's still missing

Browse Source
This commit is contained in:
Stephen Abello
2026-08-21 10:05:42 +02:00
parent aff09a731f
commit 7e3b4af093
8 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sources/Application/UI/Base/Component/Button/ButtonUIBlockFactory.php
View File

@@ -381,20 +381,33 @@ class ButtonUIBlockFactory extends AbstractUIBlockFactory
public static function MakeIconButtonFromApplicationPopupMenuItem($oPopupItem, $sColor = Button::ENUM_COLOR_SCHEME_NEUTRAL, $sActionType = Button::ENUM_ACTION_TYPE_ALTERNATIVE)
{
if ($oPopupItem instanceof JSPopupMenuItem) {
$sTooltip = $oPopupItem->GetTooltip();
if (!utils::IsNotNullOrEmptyString($sTooltip)) {
$sTooltip = $oPopupItem->GetLabel();
}
$oButton = self::MakeIconAction(
$oPopupItem->GetIconClass(),
$oPopupItem->GetTooltip()
$sTooltip
);
$oButton->SetOnClickJsCode($oPopupItem->GetJsCode());
foreach ($oPopupItem->GetLinkedScripts() as $sLinkedScript) {
$oButton->AddJsFileRelPath($sLinkedScript);
}
$oButton->SetActionType($sActionType);
$oButton->SetColor($sColor);
return $oButton;
} elseif ($oPopupItem instanceof URLPopupMenuItem) {
$sTooltip = $oPopupItem->GetTooltip();
if (!utils::IsNotNullOrEmptyString($sTooltip)) {
$sTooltip = $oPopupItem->GetLabel();
}
$oButton = self::MakeIconLink(
$oPopupItem->GetIconClass(),
$oPopupItem->GetTooltip(),
$sTooltip,
$oPopupItem->GetURL(),
$oPopupItem->GetTarget(),
);
@@ -405,6 +418,8 @@ class ButtonUIBlockFactory extends AbstractUIBlockFactory
return $oButton;
}
//TODO How to handle other types of ApplicationPopupMenuItem? For now, we return null.
return null;
}
@@ -426,6 +441,10 @@ class ButtonUIBlockFactory extends AbstractUIBlockFactory
$oButton->SetOnClickJsCode($oPopupItem->GetJsCode());
foreach ($oPopupItem->GetLinkedScripts() as $sLinkedScript) {
$oButton->AddJsFileRelPath($sLinkedScript);
}
return $oButton;
} elseif ($oPopupItem instanceof URLPopupMenuItem) {
$oButton = self::MakeForLink(
@@ -449,6 +468,8 @@ class ButtonUIBlockFactory extends AbstractUIBlockFactory
return $oButton;
}
//TODO How to handle other types of ApplicationPopupMenuItem? For now, we return null.
return null;
}
//----------------------------------------------------------------------------------------------