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

Merge remote-tracking branch 'origin/support/3.1' into support/3.2

Browse Source 
# Conflicts:
#	pages/csvimport.php
This commit is contained in:
jf-cbd
2024-04-05 14:56:38 +02:00
parent 4ca92affcf b10d381dda
commit a3553202d9
10 changed files with 1312 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webservices/import.php
View File

@@ -884,7 +884,7 @@ try
if (isset($aRowData["finalclass"]) && isset($aRowData["id"]))
{
$aRowDisp["__OBJECT_CLASS__"] = $aRowData["finalclass"];
$aRowDisp["__OBJECT_ID__"] = $aRowData["id"]->GetDisplayableValue();
$aRowDisp["__OBJECT_ID__"] = $aRowData["id"]->GetCLIValue();
}
else
{
@@ -903,7 +903,7 @@ try
if (is_object($value))
{
$aRowDisp["$sKey"] = $value->GetDisplayableValueAndDescription();
$aRowDisp["$sKey"] = $value->GetCLIValueAndDescription();
}
else
{