diff --git a/core/xmlbulkexport.class.inc.php b/core/xmlbulkexport.class.inc.php index eec7676bf..6b2a24e0d 100644 --- a/core/xmlbulkexport.class.inc.php +++ b/core/xmlbulkexport.class.inc.php @@ -41,11 +41,15 @@ class XMLBulkExport extends BulkExport switch($sPartId) { case 'xml_options': - $sChecked = (utils::ReadParam('no_localize', 0) == 1) ? ' checked ' : ''; + $sNoLocalizeChecked = (utils::ReadParam('no_localize', 0) == 1) ? ' checked ' : ''; + $sLinksetChecked = (utils::ReadParam('linksets', 0) == 1) ? ' checked ' : ''; $oP->add('
'.Dict::S('Core:BulkExport:XMLOptions').''); $oP->add(''); $oP->add(''); - $oP->add(''); + $oP->add(''); + $oP->add(''); + $oP->add(''); + $oP->add(''); $oP->add(''); $oP->add('
'); $oP->add('
'); @@ -61,6 +65,7 @@ class XMLBulkExport extends BulkExport parent::ReadParameters(); $this->aStatusInfo['localize'] = (utils::ReadParam('no_localize', 0) != 1); + $this->aStatusInfo['linksets'] = (utils::ReadParam('linksets', 0) == 1); } protected function GetSampleData($oObj, $sAttCode) @@ -135,6 +140,12 @@ class XMLBulkExport extends BulkExport } foreach(MetaModel::ListAttributeDefs($sClassName) as $sAttCode=>$oAttDef) { + if ($oAttDef->IsLinkSet() && !$this->aStatusInfo['linksets']) + { + // Skip link sets + continue; + } + if (is_null($oObj)) { $sData .= "<$sAttCode>null\n"; diff --git a/dictionaries/da.dictionary.itop.core.php b/dictionaries/da.dictionary.itop.core.php index 027730d21..9eaf032a3 100644 --- a/dictionaries/da.dictionary.itop.core.php +++ b/dictionaries/da.dictionary.itop.core.php @@ -2478,6 +2478,7 @@ Operators:
'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~', 'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~', 'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~', + 'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~', 'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~', 'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~', 'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~', diff --git a/dictionaries/de.dictionary.itop.core.php b/dictionaries/de.dictionary.itop.core.php index 64030ac2b..6cbb2ab38 100644 --- a/dictionaries/de.dictionary.itop.core.php +++ b/dictionaries/de.dictionary.itop.core.php @@ -590,6 +590,7 @@ Operatoren:
'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML (*.html)', 'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet-Optionen', 'Core:BulkExport:OptionNoLocalize' => 'Werte von Aufzählungsfeldern nicht lokalisieren', + 'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~', 'Core:BulkExport:ScopeDefinition' => 'Definition der zu exportierenden Objekte', 'Core:BulkExportLabelOQLExpression' => 'OQL-Abfrage', 'Core:BulkExportLabelPhrasebookEntry' => 'Query-Bibliotheks-Eintrag:', diff --git a/dictionaries/dictionary.itop.core.php b/dictionaries/dictionary.itop.core.php index b5b2cf35b..f38449c18 100644 --- a/dictionaries/dictionary.itop.core.php +++ b/dictionaries/dictionary.itop.core.php @@ -842,6 +842,7 @@ Dict::Add('EN US', 'English', 'English', array( 'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)', 'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options', 'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)', + 'Core:BulkExport:OptionLinkSets' => 'Include linked objects', 'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export', 'Core:BulkExportLabelOQLExpression' => 'OQL Query:', 'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:', diff --git a/dictionaries/es_cr.dictionary.itop.core.php b/dictionaries/es_cr.dictionary.itop.core.php index 7d5466498..d4ed181ee 100644 --- a/dictionaries/es_cr.dictionary.itop.core.php +++ b/dictionaries/es_cr.dictionary.itop.core.php @@ -836,6 +836,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array( 'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~', 'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~', 'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~', + 'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~', 'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~', 'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~', 'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~', diff --git a/dictionaries/fr.dictionary.itop.core.php b/dictionaries/fr.dictionary.itop.core.php index cbacfb53f..03bdd00d7 100644 --- a/dictionaries/fr.dictionary.itop.core.php +++ b/dictionaries/fr.dictionary.itop.core.php @@ -700,6 +700,7 @@ Opérateurs :
'Core:BulkExport:SpreadsheetFormat' => 'Format HTML pour Excel (*.html)', 'Core:BulkExport:SpreadsheetOptions' => 'Options du format HTML pour Excel', 'Core:BulkExport:OptionNoLocalize' => 'Ne pas traduire les valeurs (pour les champs de type "Enum")', + 'Core:BulkExport:OptionLinkSets' => 'Inclure les objets liés', 'Core:BulkExport:ScopeDefinition' => 'Définition des objets à exporter', 'Core:BulkExportLabelOQLExpression' => 'Requête OQL:', 'Core:BulkExportLabelPhrasebookEntry' => 'Entrée du livre des requêtes:', diff --git a/dictionaries/hu.dictionary.itop.core.php b/dictionaries/hu.dictionary.itop.core.php index 5fc3c4128..37ed27085 100755 --- a/dictionaries/hu.dictionary.itop.core.php +++ b/dictionaries/hu.dictionary.itop.core.php @@ -593,6 +593,7 @@ Operators:
'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~', 'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~', 'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~', + 'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~', 'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~', 'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~', 'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~', diff --git a/dictionaries/it.dictionary.itop.core.php b/dictionaries/it.dictionary.itop.core.php index 2f13578f1..15c3fa986 100644 --- a/dictionaries/it.dictionary.itop.core.php +++ b/dictionaries/it.dictionary.itop.core.php @@ -825,6 +825,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~', 'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~', 'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~', + 'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~', 'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~', 'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~', 'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~', diff --git a/dictionaries/ja.dictionary.itop.core.php b/dictionaries/ja.dictionary.itop.core.php index 601223198..57099f2df 100644 --- a/dictionaries/ja.dictionary.itop.core.php +++ b/dictionaries/ja.dictionary.itop.core.php @@ -614,6 +614,7 @@ Operators:
'Core:BulkExport:XMLOptions' => 'XML Options~~', 'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~', 'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~', + 'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~', 'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~', 'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~', 'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~', diff --git a/dictionaries/nl.dictionary.itop.core.php b/dictionaries/nl.dictionary.itop.core.php index 41cc79453..2123a3e04 100644 --- a/dictionaries/nl.dictionary.itop.core.php +++ b/dictionaries/nl.dictionary.itop.core.php @@ -844,6 +844,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'Core:BulkExport:XMLOptions' => 'XML Options~~', 'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~', 'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~', + 'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~', 'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~', 'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~', 'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~', diff --git a/dictionaries/pt_br.dictionary.itop.core.php b/dictionaries/pt_br.dictionary.itop.core.php index 28554c32c..daea98b1d 100644 --- a/dictionaries/pt_br.dictionary.itop.core.php +++ b/dictionaries/pt_br.dictionary.itop.core.php @@ -837,6 +837,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'Core:BulkExport:XMLOptions' => 'XML Options~~', 'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~', 'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~', + 'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~', 'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~', 'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~', 'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~', diff --git a/dictionaries/ru.dictionary.itop.core.php b/dictionaries/ru.dictionary.itop.core.php index 8d9a4a020..1934278e2 100644 --- a/dictionaries/ru.dictionary.itop.core.php +++ b/dictionaries/ru.dictionary.itop.core.php @@ -832,6 +832,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Core:BulkExport:XMLOptions' => 'XML Options~~', 'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~', 'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~', + 'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~', 'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~', 'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~', 'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~', diff --git a/dictionaries/tr.dictionary.itop.core.php b/dictionaries/tr.dictionary.itop.core.php index ce8bc059f..df4ec632d 100644 --- a/dictionaries/tr.dictionary.itop.core.php +++ b/dictionaries/tr.dictionary.itop.core.php @@ -764,6 +764,7 @@ Operators:
'Core:BulkExport:XMLOptions' => 'XML Options~~', 'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~', 'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~', + 'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~', 'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~', 'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~', 'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~', diff --git a/dictionaries/zh.dictionary.itop.core.php b/dictionaries/zh.dictionary.itop.core.php index d07e4a21f..0b836efd9 100644 --- a/dictionaries/zh.dictionary.itop.core.php +++ b/dictionaries/zh.dictionary.itop.core.php @@ -763,6 +763,7 @@ Operators:
'Core:BulkExport:XMLOptions' => 'XML Options~~', 'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~', 'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~', + 'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~', 'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~', 'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~', 'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',