Export - small cleanup #12864
Merged
Export - small cleanup #12864
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eileenmcnaughton
force-pushed
the
export
branch
from
edc6a48 to
29034a9
Compare
mattwire
reviewed
Sep 25, 2018
| @@ -749,7 +710,7 @@ public static function exportCustom($customSearchClass, $formValues, $order) { | |||
| $rows[] = $row; | |||
| } | |||
|
|
|||
| CRM_Core_Report_Excel::writeCSVFile(self::getExportFileName(), $header, $rows); | |||
| CRM_Core_Report_Excel::writeCSVFile(ts('CiviCRM Contact Search'), $header, $rows); | |||
| CRM_Utils_System::civiExit(); | |||
There was a problem hiding this comment.
Not sure about this change as it duplicates a string - do we need to make this change?
There was a problem hiding this comment.
The point is to stop it calling what is essentially an unrelated function for a different export process - ie. to break dumb interdependencies
There was a problem hiding this comment.
Right. Totally makes sense then :-)
|
I've looked through this and made one trivial comment. The code looks good to me, it's cleanup and will make the code easier to maintain. @twomice are you able to run this? |
|
test this please |
|
CiviCRM Review Template DEL-1.1)
|
|
what a beautiful PR review :-) - merging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Minor tidy up on export
Before
parameters $saveFile & $batchItems are passed in but never set in calling functions. Export mode passed in
After
unneeded params not passed in. processor object passed in instead of exportMode. This is part of a bigger picture effort to move processing off to that object rather than passing around parameters
Technical Details
getExportFileName appears to be called from 2 places. One is on the file where it always passed no params & gets the same result so this is now hard-coded. The second is moved to the ExportProcessor class, with some handling for the possibility that mode might be invalid - but I think that is never true.
Comments
Follow up on #12586