composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 06:48:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/uninstallation

Browse Source
This commit is contained in:
Benjamin DALSASS
2026-04-29 11:08:03 +02:00
parent 42fdffe25b eee57b25fa
commit 0fc7434794
27 changed files with 397 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php
View File

@@ -689,6 +689,7 @@ class ManageBrickController extends BrickController
$sValue = $oAttDef->GetAsHTML($oCurrentRow->Get($sItemAttr));
$sSortValue = $oCurrentRow->Get($sItemAttr);
}
$sAttType = $oAttDef->GetType();
unset($oAttDef);
// For simple fields, we get the raw (stored) value as well
@@ -705,7 +706,7 @@ class ManageBrickController extends BrickController
'object_class' => $sCurrentObjectClass,
'object_id' => $sCurrentObjectId,
'attribute_code' => $sItemAttr,
'attribute_type' => $sAttDefClass,
'attribute_type' => $sAttType,
'value_raw' => $attValueRaw,
'value_html' => $sValue,
'sort_value' => $sSortValue,

4
datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php
View File

@@ -1385,7 +1385,7 @@ class ObjectController extends BrickController
'object_id' => $oNewLink->GetKey(),
'prefix' => 'lnk__',
'attribute_code' => $sAttCode,
'attribute_type' => get_class($oAttDef),
'attribute_type' => $oAttDef->GetType(),
'value_html' => $sValue,
];
@@ -1442,7 +1442,7 @@ class ObjectController extends BrickController
'object_class' => $sObjectClass,
'object_id' => $oObject->GetKey(),
'attribute_code' => $oAttDef->GetCode(),
'attribute_type' => get_class($oAttDef),
'attribute_type' => $oAttDef->GetType(),
];
// - Value raw

4
datamodels/2.x/itop-portal-base/portal/src/Helper/BrowseBrickHelper.php
View File

@@ -324,7 +324,7 @@ class BrowseBrickHelper
'object_class' => $sCurrentObjectClass,
'object_id' => $sCurrentObjectId,
'attribute_code' => $sNameAttCode,
'attribute_type' => $sNameAttDefClass,
'attribute_type' => $sNameAttDef->GetType(),
'value_raw' => $value->Get($sNameAttCode),
],
];
@@ -415,7 +415,7 @@ class BrowseBrickHelper
'object_class' => $sCurrentObjectClass,
'object_id' => $sCurrentObjectId,
'attribute_code' => $aField['code'],
'attribute_type' => $sAttDefClass,
'attribute_type' => $oAttDef->GetType(),
'value_raw' => $attValueRaw,
'value_html' => $sHtmlForFieldValue,
];