From e0a655e102af9dd1df6288ce164e2726d170ff10 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Wed, 24 Mar 2021 23:57:30 +0100 Subject: [PATCH] Button factory: Fix name param. being mandatory on some methods --- .../Component/Button/ButtonUIBlockFactory.php | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sources/application/UI/Base/Component/Button/ButtonUIBlockFactory.php b/sources/application/UI/Base/Component/Button/ButtonUIBlockFactory.php index 2a38db3cd..308dff1bc 100644 --- a/sources/application/UI/Base/Component/Button/ButtonUIBlockFactory.php +++ b/sources/application/UI/Base/Component/Button/ButtonUIBlockFactory.php @@ -45,16 +45,20 @@ class ButtonUIBlockFactory extends AbstractUIBlockFactory * Make a basis Button component for any purpose * * @param string $sLabel - * @param string $sName See {@link Button::$sName} + * @param string|null $sName See {@link Button::$sName} * @param string|null $sId * * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ - public static function MakeNeutral(string $sLabel, string $sName, ?string $sId = null): Button { + public static function MakeNeutral(string $sLabel, string $sName = null, ?string $sId = null): Button + { $oButton = new ButtonJS($sLabel, $sId); $oButton->SetActionType(Button::ENUM_ACTION_TYPE_REGULAR) - ->SetColor(Button::ENUM_COLOR_NEUTRAL) - ->SetName($sName); + ->SetColor(Button::ENUM_COLOR_NEUTRAL); + + if (!empty($sName)) { + $oButton->SetName($sName); + } return $oButton; } @@ -152,17 +156,17 @@ class ButtonUIBlockFactory extends AbstractUIBlockFactory /** * Make a basis Button component for any purpose * - * @param string $sLabel - * @param string $sName See Button::$sName + * @param string $sLabel + * @param string|null $sName See Button::$sName * @param string|null $sValue See Button::$sValue - * @param bool $bIsSubmit See Button::$sType + * @param bool $bIsSubmit See Button::$sType * @param string|null $sId * * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ public static function MakeAlternativeNeutral( string $sLabel, - string $sName, + string $sName = null, string $sValue = null, bool $bIsSubmit = false, ?string $sId = null