composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix object's tabs IDs in the URL (regression introduced by 1fc54edf)

Browse Source
This commit is contained in:
Molkobain
2021-02-17 17:24:22 +01:00
parent f297cdb8b2
commit acf721befa
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sources/application/UI/Base/Layout/TabContainer/TabContainer.php
View File

@@ -77,11 +77,14 @@ class TabContainer extends UIContentBlock
*/
public function __construct($sId, $sPrefix)
{
$sId = null;
if (!empty($sId) || !empty($sPrefix)) {
$sId = "{$sId}".((!empty($sPrefix)) ? "-{$sPrefix}" : "");
// Intention is to pass the $sPrefix as the UIBlock ID even when no $sId is provided (eg. sometimes $sId is "")
// But in case everything comes down to an empty string (""), we give a null to the constructor so it can generate a good one to prevent collision
$sRealIdSeparator = (!empty($sId) && !empty($sPrefix)) ? '-' : '';
$sRealId = $sId.$sRealIdSeparator.$sPrefix;
if (empty($sRealId)) {
$sRealId = null;
}
parent::__construct($sId);
parent::__construct($sRealId);
$this->sName = $sId;
$this->sPrefix = $sPrefix;