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

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	composer.lock
#	datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
#	lib/composer/autoload_files.php
#	lib/composer/autoload_real.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.json
#	lib/composer/installed.php
This commit is contained in:
Eric Espie
2022-07-11 17:24:06 +02:00
parent c56cb516ed 03b56b2941
commit e91e53c0ec
48 changed files with 1065 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -424,11 +424,11 @@ class ButtonUIBlockFactory extends AbstractUIBlockFactory
$oButton->SetActionType($sActionType)
->SetColor($sColor);
if (utils::StrLen($sValue) > 0) {
if (utils::IsNotNullOrEmptyString($sValue)) {
$oButton->SetValue($sValue);
}
if (utils::StrLen($sName) > 0) {
if (utils::IsNotNullOrEmptyString($sName)) {
$oButton->SetName($sName);
}