diff --git a/CHANGELOG.md b/CHANGELOG.md index b00009dc45f7bfc923d67a630cb42a1946d564d4..cf4d2c2d150ef83f0c3dbb631a92f2a52325fc8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ -# Version 1.30 (not yet released) +# Version 1.30 * Fixed issue with relative date and required filters. * Compatibility with php 7.0 * Activity search with empty id. * Fixed issue with aggregation on date fields #78 +* Fixed issue with CSV and PDF Download output. # Version 1.29 diff --git a/CRM/DataprocessorOutputExport/CSV.php b/CRM/DataprocessorOutputExport/CSV.php index 9febcfbe85599ddcb71a6ac11e1e9ce56047233b..e41c701144dbf417aa16b3559df79aca0aff1fe9 100644 --- a/CRM/DataprocessorOutputExport/CSV.php +++ b/CRM/DataprocessorOutputExport/CSV.php @@ -155,7 +155,7 @@ class CRM_DataprocessorOutputExport_CSV implements ExportOutputInterface, Direct } } - public function doDirectDownload(\Civi\DataProcessor\ProcessorType\AbstractProcessorType $dataProcessorClass, $dataProcessor, $outputBAO, $sortFieldName = null, $sortDirection = 'ASC', $idField, $selectedIds=array()) { + public function doDirectDownload(\Civi\DataProcessor\ProcessorType\AbstractProcessorType $dataProcessorClass, $dataProcessor, $outputBAO, $sortFieldName = null, $sortDirection = 'ASC', $idField=null, $selectedIds=array()) { $filename = date('Ymdhis').'_'.$dataProcessor['id'].'_'.$outputBAO['id'].'_'.CRM_Core_Session::getLoggedInContactID().'_'.$dataProcessor['name'].'.csv'; $download_name = date('Ymdhis').'_'.$dataProcessor['name'].'.csv'; @@ -183,6 +183,7 @@ class CRM_DataprocessorOutputExport_CSV implements ExportOutputInterface, Direct \CRM_Core_Error::statusBounce('The file is either empty or you do not have permission to retrieve the file'); } + CRM_Utils_System::setHttpHeader('Access-Control-Allow-Origin', '*'); \CRM_Utils_System::download( $download_name, $mimeType, diff --git a/CRM/DataprocessorOutputExport/PDF.php b/CRM/DataprocessorOutputExport/PDF.php index 5a9604610d4b862d744ff17c48ae754fcbff2942..b8d2ac4a160346e2e8f8e2cb5c72cb92859e9dfb 100644 --- a/CRM/DataprocessorOutputExport/PDF.php +++ b/CRM/DataprocessorOutputExport/PDF.php @@ -258,7 +258,7 @@ class CRM_DataprocessorOutputExport_PDF implements ExportOutputInterface, Direct } } - public function doDirectDownload(\Civi\DataProcessor\ProcessorType\AbstractProcessorType $dataProcessorClass, $dataProcessor, $outputBAO, $sortFieldName = null, $sortDirection = 'ASC', $idField, $selectedIds=array()) { + public function doDirectDownload(\Civi\DataProcessor\ProcessorType\AbstractProcessorType $dataProcessorClass, $dataProcessor, $outputBAO, $sortFieldName = null, $sortDirection = 'ASC', $idField=null, $selectedIds=array()) { $filename = date('Ymdhis').'_'.$dataProcessor['id'].'_'.$outputBAO['id'].'_'.CRM_Core_Session::getLoggedInContactID().'_'.$dataProcessor['name'].'.html'; $download_name = date('Ymdhis').'_'.$dataProcessor['name'].'.pdf'; @@ -286,6 +286,7 @@ class CRM_DataprocessorOutputExport_PDF implements ExportOutputInterface, Direct \CRM_Core_Error::statusBounce('The file is either empty or you do not have permission to retrieve the file'); } + CRM_Utils_System::setHttpHeader('Access-Control-Allow-Origin', '*'); \CRM_Utils_System::download( $download_name, $mimeType, diff --git a/CRM/DataprocessorOutputExport/Page/Download.php b/CRM/DataprocessorOutputExport/Page/Download.php index 6407aea8e46320da395d2c2c4f1b066f61333fae..244ef1c159ac9888006b66b537dfc2ffc2da9662 100644 --- a/CRM/DataprocessorOutputExport/Page/Download.php +++ b/CRM/DataprocessorOutputExport/Page/Download.php @@ -52,6 +52,7 @@ class CRM_DataprocessorOutputExport_Page_Download extends CRM_Core_Page { CRM_Core_Error::statusBounce('The file is either empty or you do not have permission to retrieve the file'); } + CRM_Utils_System::setHttpHeader('Access-Control-Allow-Origin', '*'); CRM_Utils_System::download( $download_name, $mimeType, diff --git a/Civi/DataProcessor/Output/DirectDownloadExportOutputInterface.php b/Civi/DataProcessor/Output/DirectDownloadExportOutputInterface.php index 0a5313b4a6236625c5a8be11341d7de845eaf935..088222e438d304033971966f7778286ae2d6ef96 100644 --- a/Civi/DataProcessor/Output/DirectDownloadExportOutputInterface.php +++ b/Civi/DataProcessor/Output/DirectDownloadExportOutputInterface.php @@ -28,6 +28,6 @@ interface DirectDownloadExportOutputInterface extends UrlOutputInterface { * Array with the selectedIds. * @return string */ - public function doDirectDownload(\Civi\DataProcessor\ProcessorType\AbstractProcessorType $dataProcessorClass, $dataProcessor, $outputBAO, $sortFieldName = null, $sortDirection = 'ASC', $idField, $selectedIds=array()); + public function doDirectDownload(\Civi\DataProcessor\ProcessorType\AbstractProcessorType $dataProcessorClass, $dataProcessor, $outputBAO, $sortFieldName = null, $sortDirection = 'ASC', $idField=null, $selectedIds=array()); } diff --git a/info.xml b/info.xml index 8f7142fa2318e7cb9095e491ccf5f77e22a5cc47..222ec56029b103159665b51e880242a303985587 100644 --- a/info.xml +++ b/info.xml @@ -14,8 +14,8 @@ <url desc="Documentation">https://lab.civicrm.org/extensions/dataprocessor/blob/master/README.md</url> <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> - <releaseDate>2021-01-15</releaseDate> - <version>1.30-dev</version> + <releaseDate>2021-02-03</releaseDate> + <version>1.30</version> <develStage>stable</develStage> <compatibility> <ver>4.7</ver>