Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-14834 - fix activity export when relationship in export fields #11526

Merged
merged 2 commits into from
Jan 18, 2018

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Jan 16, 2018

Overview

Per JIRA activity export fails if a relationship field is selected

Before

Fatal error when exporting activities from advanced search with a relationship field selected - per screenshot.
screenshot 2018-01-16 12 35 37

After

Export succeeds

Technical Details

Error was a really dumb bit of code - re-using the variable $query for a temp sql string.

Comments

I was able to replicate it in a unit test


@eileenmcnaughton
Copy link
Contributor Author

test this please

@eileenmcnaughton eileenmcnaughton force-pushed the export_fix_activity branch 3 times, most recently from f92e371 to fb86196 Compare January 16, 2018 07:49
I was thinking this might fail but it is passing so let's lock it in
caller
@yashodha
Copy link
Contributor

test this please

@yashodha
Copy link
Contributor

@eileenmcnaughton tested, this works fine.

@colemanw colemanw merged commit d3d1a20 into civicrm:master Jan 18, 2018
@eileenmcnaughton eileenmcnaughton deleted the export_fix_activity branch January 18, 2018 23:55
@mlutfy mlutfy added this to the 4.7.31 milestone Feb 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants