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

N°10006 - fix audit display in case of no fields provided (#1039)

Browse Source
This commit is contained in:
odain-cbd
2026-09-04 10:07:05 +02:00
committed by GitHub
parent 0ae3bc2821
commit 1a395f4b50
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/tabularbulkexport.class.inc.php
View File

@@ -363,13 +363,13 @@ EOF
}
}
foreach ($aAuthorizedClasses as $sAlias => $sClassName) {
foreach (MetaModel::GetZListItems($sClassName, 'details') as $sAttCode) {
//$oAttDef = Metamodel::GetAttributeDef($sClassName, $sAttCode);
if (utils::IsNullOrEmptyString($sAlias)) {
$aFields[] = "$sAttCode";
} else {
$aFields[] = "$sAlias.$sAttCode";
foreach (MetaModel::ListAttributeDefs($sClassName) as $oAttribute) {
$sAttCode = $oAttribute->GetCode();
if (! $this->IsExportableField($sClassName, $sAttCode, $oAttribute)) {
continue;
}
$sCurrentAlias = utils::IsNullOrEmptyString($sAlias) ? "" : "$sAlias.";
$aFields[] = "{$sCurrentAlias}{$sAttCode}";
}
}

14
tests/php-unit-tests/unitary-tests/webservices/ExportTest.php
View File

@@ -56,7 +56,7 @@ HEADER;
$sOutput = $this->performExportTesting($aParams, $this->sLogin);
$sExpectedHeader = <<<HEADER
"Person","Organization","Email","Login","Language","Status","Profiles","Allowed Organizations","log"
"Person","Last name","First name","Email","Organization","Login","Language","Status","log","Type of account","Full name","Person","Person->Obsolete","Person->Organization","Person->Organization->Obsolete"
HEADER;
@@ -85,14 +85,20 @@ HEADER;
$sExpectedHeader = <<<HEADER
<td>Person</td>
<td>Organization</td>
<td>Last name</td>
<td>First name</td>
<td>Email</td>
<td>Organization</td>
<td>Login</td>
<td>Language</td>
<td>Status</td>
<td>Profiles</td>
<td>Allowed Organizations</td>
<td>log</td>
<td>Type of account</td>
<td>Full name</td>
<td>Person</td>
<td>Person->Obsolete</td>
<td>Person->Organization</td>
<td>Person->Organization->Obsolete</td>
HEADER;
$this->assertStringContainsString("$sExpectedHeader", $sOutput, "Header ($sExpectedHeader)\n should be in export-v2 answer: \n$sOutput");