Skip to content
Snippets Groups Projects
Commit ded20d41 authored by bgm's avatar bgm Committed by bgm
Browse files

Update the civiexportexcel-core.patch

parent 0392e80f
No related branches found
No related tags found
No related merge requests found
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 6bf8ca1a09..7c0144e60a 100644
index eff1db9a..b2ace0e1 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -152,6 +152,9 @@ class CRM_Report_Form extends CRM_Core_Form {
*/
@@ -156,6 +156,11 @@ class CRM_Report_Form extends CRM_Core_Form {
protected $_groupFilter = FALSE;
+ // [ML] Required for civiexportexcel
/**
+ * Required for civiexportexcel.
+ */
+ public $supportsExportExcel = TRUE;
+
/**
+ /**
* Has the report been optimised for group filtering.
*
@@ -1393,7 +1396,7 @@ class CRM_Report_Form extends CRM_Core_Form {
* The functionality for group filtering has been improved but not
@@ -1434,7 +1439,7 @@ class CRM_Report_Form extends CRM_Core_Form {
if (!CRM_Core_Permission::check('view report sql')) {
return;
}
- $ignored_output_modes = array('pdf', 'csv', 'print');
+ $ignored_output_modes = array('pdf', 'csv', 'print', 'excel2007');
- $ignored_output_modes = ['pdf', 'csv', 'print'];
+ $ignored_output_modes = ['pdf', 'csv', 'print', 'excel2007'];
if (in_array($this->_outputMode, $ignored_output_modes)) {
return;
}
@@ -2760,6 +2763,11 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
@@ -2842,6 +2847,11 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
$this->_absoluteUrl = TRUE;
$this->addPaging = FALSE;
}
......@@ -33,7 +35,7 @@ index 6bf8ca1a09..7c0144e60a 100644
elseif ($this->_outputMode == 'group') {
$this->assign('outputMode', 'group');
}
@@ -3403,6 +3411,9 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
@@ -3494,6 +3504,9 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
elseif ($this->_outputMode == 'csv') {
CRM_Report_Utils_Report::export2csv($this, $rows);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment