composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-21 01:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Exports: continuation of commit 3681 (Make the correct column name for friendly names (ext key -> ext field) enlarged to ALL formats with the exception of XML

Browse Source 
SVN:trunk[3698]
This commit is contained in:
Romain Quetiez
2015-08-26 13:08:02 +00:00
parent 35c57bb10c
commit 20815f1a91
3 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/excelbulkexport.class.inc.php
View File

@@ -149,10 +149,22 @@ class ExcelBulkExport extends TabularBulkExport
{
$sType = 'datetime';
}
$sLabel = $sAttCode;
if ($this->aStatusInfo['localize'])
if (($oAttDef instanceof AttributeExternalField) || (($oAttDef instanceof AttributeFriendlyName) && ($oAttDef->GetKeyAttCode() != 'id')))
{
$sLabel = $oAttDef->GetLabel();
$oKeyAttDef = MetaModel::GetAttributeDef($sClass, $oAttDef->GetKeyAttCode());
$oExtAttDef = MetaModel::GetAttributeDef($oKeyAttDef->GetTargetClass(), $oAttDef->GetExtAttCode());
if ($this->aStatusInfo['localize'])
{
$sLabel = $oKeyAttDef->GetLabel().'->'.$oExtAttDef->GetLabel();
}
else
{
$sLabel = $oKeyAttDef->GetCode().'->'.$oExtAttDef->GetCode();
}
}
else
{
$sLabel = $this->aStatusInfo['localize'] ? $oAttDef->GetLabel() : $sAttCode;
}
$aTableHeaders[] = array('label' => $sFullAlias.$sLabel, 'type' => $sType);

16
core/htmlbulkexport.class.inc.php
View File

@@ -115,13 +115,23 @@ class HTMLBulkExport extends TabularBulkExport
default:
$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
if (count($aSelectedClasses) > 1)
if (($oAttDef instanceof AttributeExternalField) || (($oAttDef instanceof AttributeFriendlyName) && ($oAttDef->GetKeyAttCode() != 'id')))
{
$aData[] = $sAlias.'.'.$oAttDef->GetLabel();
$oKeyAttDef = MetaModel::GetAttributeDef($sClass, $oAttDef->GetKeyAttCode());
$oExtAttDef = MetaModel::GetAttributeDef($oKeyAttDef->GetTargetClass(), $oAttDef->GetExtAttCode());
$sLabel = $oKeyAttDef->GetLabel().'->'.$oExtAttDef->GetLabel();
}
else
{
$aData[] = $oAttDef->GetLabel();
$sLabel = $oAttDef->GetLabel();
}
if (count($aSelectedClasses) > 1)
{
$aData[] = $sAlias.'.'.$sLabel;
}
else
{
$aData[] = $sLabel;
}
}
}

18
core/spreadsheetbulkexport.class.inc.php
View File

@@ -123,7 +123,23 @@ class SpreadsheetBulkExport extends TabularBulkExport
default:
$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
$sColLabel = $this->aStatusInfo['localize'] ? MetaModel::GetLabel($sClass, $sAttCode) : $sAttCode;
if (($oAttDef instanceof AttributeExternalField) || (($oAttDef instanceof AttributeFriendlyName) && ($oAttDef->GetKeyAttCode() != 'id')))
{
$oKeyAttDef = MetaModel::GetAttributeDef($sClass, $oAttDef->GetKeyAttCode());
$oExtAttDef = MetaModel::GetAttributeDef($oKeyAttDef->GetTargetClass(), $oAttDef->GetExtAttCode());
if ($this->aStatusInfo['localize'])
{
$sColLabel = $oKeyAttDef->GetLabel().'->'.$oExtAttDef->GetLabel();
}
else
{
$sColLabel = $oKeyAttDef->GetCode().'->'.$oExtAttDef->GetCode();
}
}
else
{
$sColLabel = $this->aStatusInfo['localize'] ? $oAttDef->GetLabel() : $sAttCode;
}
$oFinalAttDef = $oAttDef->GetFinalAttDef();
if (get_class($oFinalAttDef) == 'AttributeDateTime')
{