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

N°2746 - Fix export separator

Browse Source
This commit is contained in:
Eric
2020-02-13 12:12:35 +01:00
parent ef3bdd63a4
commit 0ecfffe413
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/attributedef.class.inc.php
View File

@@ -10104,6 +10104,7 @@ abstract class AttributeSet extends AttributeDBFieldVoid
*/
public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
{
$sSepItem = MetaModel::GetConfig()->Get('tag_set_item_separator');
if (is_object($value) && ($value instanceof ormSet))
{
if ($bLocalize)
@@ -10114,7 +10115,7 @@ abstract class AttributeSet extends AttributeDBFieldVoid
{
$aValues = $value->GetValues();
}
$sRes = implode($sSeparator, $aValues);
$sRes = implode($sSepItem, $aValues);
}
else
{
@@ -10283,6 +10284,7 @@ class AttributeEnumSet extends AttributeSet
*/
public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
{
$sSepItem = MetaModel::GetConfig()->Get('tag_set_item_separator');
if (is_object($value) && ($value instanceof ormSet))
{
$aValues = $value->GetValues();
@@ -10291,11 +10293,11 @@ class AttributeEnumSet extends AttributeSet
$aLocalizedValues = array();
foreach($aValues as $sValue)
{
$aLocalizedValues[] = utils::HtmlEntities($this->GetValueLabel($sValue));
$aLocalizedValues[] = $this->GetValueLabel($sValue);
}
$aValues = $aLocalizedValues;
}
$sRes = implode($sSeparator, $aValues);
$sRes = implode($sSepItem, $aValues);
}
else
{

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

@@ -193,7 +193,7 @@ EOF
$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
$sRet = $oAttDef->GetAsCSV($value, '', '', $oObj);
}
else if ($value instanceOf ormTagSet)
else if ($value instanceOf ormSet)
{
$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
$sRet = $oAttDef->GetAsCSV($value, '', '', $oObj);
@@ -386,4 +386,4 @@ EOF
{
return array('xlsx' => Dict::S('Core:BulkExport:XLSXFormat'));
}
}
}