composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +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:
Molkobain
2022-03-23 09:49:11 +01:00
parent 1db4b9a12e 73c6b4be20
commit ad4442ae78
27 changed files with 480 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/Application/Search/searchform.class.inc.php
View File

@@ -493,7 +493,7 @@ class SearchForm
$aAllowedValues = array();
while ($oObject = $oSet->Fetch())
{
$aAllowedValues[] = ["value"=>$oObject->GetKey(), "label" => $oObject->GetName()];
$aAllowedValues[$oObject->GetKey()] = $oObject->GetName();
}
return array('values' => $aAllowedValues);
}

4
sources/Application/UI/Base/Component/ButtonGroup/ButtonGroup.php
View File

@@ -25,6 +25,10 @@ class ButtonGroup extends UIBlock
public const BLOCK_CODE = 'ibo-button-group';
/** @inheritDoc */
public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/button-group/layout';
public const DEFAULT_JS_FILES_REL_PATH = [
'js/components/button-group.js',
];
public const REQUIRES_ANCESTORS_DEFAULT_JS_FILES = true;
/** @var \Combodo\iTop\Application\UI\Base\Component\Button\Button[] Buttons to be displayed as a group */
protected $aButtons;