N°3111 - Fix Portal export

datamodels/2.x/itop-portal-base/portal/public/js/export.js

@@ -20,8 +20,8 @@ function ExportStartExport() {
     var oParams = {};
     oParams.operation = 'export_build';
     oParams.format = sFormat;
-    oParams.expression = sOQL;
-    oParams.fields = sFields;
+    oParams.token = sToken;
+    oParams.start = 1;
     $.post(GetAbsoluteUrlAppRoot() + 'pages/ajax.render.php', oParams, function (data) {
         if (data == null) {
             ExportError('Export failed (no data provided), please contact your administrator');

datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php

@@ -28,6 +28,7 @@ use AttributeImage;
 use AttributeSet;
 use AttributeTagSet;
 use BinaryExpression;
+use BulkExport;
 use CMDBSource;
 use Combodo\iTop\Portal\Brick\AbstractBrick;
 use Combodo\iTop\Portal\Brick\ManageBrick;
@@ -245,11 +246,18 @@ class ManageBrickController extends BrickController
 		}
 
 		$sFields = implode(',', $aFields);
+		$sFormat = 'xlsx';
+		$oSearch->UpdateContextFromUser();
+		$oExporter = BulkExport::FindExporter($sFormat, $oSearch);
+		$oExporter->SetObjectList($oSearch);
+		$oExporter->SetFormat($sFormat);
+		$oExporter->SetChunkSize(EXPORTER_DEFAULT_CHUNK_SIZE);
+		$oExporter->SetFields($sFields);
+
 		$aData = array(
 			'oBrick' => $oBrick,
 			'sBrickId' => $sBrickId,
-			'sFields' => $sFields,
-			'sOQL' => $oSearch->ToOQL(),
+			'sToken' => $oExporter->SaveState(),
 		);
 
 		return $this->render(static::EXCEL_EXPORT_TEMPLATE_PATH, $aData);

datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/popup-export-excel.html.twig

@@ -27,9 +27,8 @@
 
 <script type="text/javascript">
     var sDataState = 'not-yet-started';
-    var sOQL = {{ sOQL|json_encode|raw }};
+    var sToken = {{ sToken|raw }};
     var sFormat = 'xlsx';
-    var sFields = "{{ sFields }}";
 
     $(document).ready(function () {
         window.setTimeout(function () {