Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
Export to Excel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Extensions
Export to Excel
Commits
ded20d41
Commit
ded20d41
authored
5 years ago
by
bgm
Committed by
bgm
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Update the civiexportexcel-core.patch
parent
0392e80f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
civiexportexcel-core.patch
+12
-10
12 additions, 10 deletions
civiexportexcel-core.patch
with
12 additions
and
10 deletions
civiexportexcel-core.patch
+
12
−
10
View file @
ded20d41
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;
}
@@ -2
760
,6 +2
763
,11 @@
WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
@@ -2
842
,6 +2
847
,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');
}
@@ -34
03
,6 +3
411
,9 @@
WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
@@ -34
94
,6 +3
504
,9 @@
WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND
elseif ($this->_outputMode == 'csv') {
CRM_Report_Utils_Report::export2csv($this, $rows);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment