diff --git a/CHANGELOG.md b/CHANGELOG.md index 40363d549d6e8a91c9e71e7cf8c718971aa29b9e..ead7f621f0f3833126c2f83e41e727efcf57b680 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ -# Version 1.90 (not yet released) +# Version 1.90 + +* Fixed issue with download spreadsheet export and selection of all records. # Version 1.89 diff --git a/CRM/DataprocessorOutputExport/AbstractOutputExport.php b/CRM/DataprocessorOutputExport/AbstractOutputExport.php index 4a8d25735bc50aa52bf1ac5d863ab3b386f78fba..aaa406eee39a8b5c82e531806d5a70091fa5d73a 100644 --- a/CRM/DataprocessorOutputExport/AbstractOutputExport.php +++ b/CRM/DataprocessorOutputExport/AbstractOutputExport.php @@ -224,7 +224,6 @@ abstract class CRM_DataprocessorOutputExport_AbstractOutputExport implements Exp try { static::addSelectedIdsFilterToDataProcessor($dataProcessorClass, $idField, $selectedIds); $count = CRM_Dataprocessor_Form_Output_AbstractUIOutputForm::getCount($dataProcessorClass, $formValues); - $debug = $dataProcessorClass->getDataFlow()->getDebugInformation(); if ($count > $this->getMaxDirectDownload()) { $this->startBatchJob($dataProcessorClass, $dataProcessor, $outputBAO, $formValues, $sortFieldName, $sortDirection, $idField, $selectedIds); } else { @@ -269,13 +268,15 @@ abstract class CRM_DataprocessorOutputExport_AbstractOutputExport implements Exp try { $dataProcessorClass->getDataFlow()->resetSort(); $dataProcessorClass->getDataFlow()->addSort($sortFieldName, $sortDirection); - $dataProcessorClass->getDataFlow()->resetInitializeState(); } catch (InvalidFlowException $e) { } } + $dataProcessorClass->getDataFlow()->resetInitializeState(); $this->createHeader($path, $dataProcessorClass, $outputBAO['configuration'], $dataProcessor, $idField, $selectedIds, $formValues); + $dataProcessorClass->getDataFlow()->resetInitializeState(); $this->exportRecords($path, $dataProcessorClass, $outputBAO['configuration'], $idField, $selectedIds, $formValues); + $dataProcessorClass->getDataFlow()->resetInitializeState(); $this->createFooter($path, $dataProcessorClass, $outputBAO['configuration'], $dataProcessor, $idField, $selectedIds, $formValues); $mimeType = $this->mimeType(); diff --git a/info.xml b/info.xml index b6aa86d0c83be69b39ba192143f037f54273613c..b0f15ffbe8c4703cd3e260f52226ae5726bd9192 100644 --- a/info.xml +++ b/info.xml @@ -15,7 +15,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2023-10-06</releaseDate> - <version>1.90-dev</version> + <version>1.90</version> <develStage>stable</develStage> <compatibility> <ver>5.37</ver>