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

dev/core#942 fix failure to render names for some activities #14231

Merged
merged 3 commits into from
May 12, 2019

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented May 10, 2019

Overview

Set limit for activity_contact retrieval to 0, allowing to retrieve more than 25 activity contacts when rendering the first 25 activities on the activity contact tab

Before

before

After

after

Technical Details

This moves the logic for retrieving the target contacts back into the getActivities function. We are stil not wanting to bypass the ACLs so still using the
api but strictly limiting the number of contacts we retrieve (at the cost of extra queries, but cheap ones).

Some tests added on the Bulk Mail activity.

Comments

@civibot
Copy link

civibot bot commented May 10, 2019

(Standard links)

@civibot civibot bot added the 5.13 label May 10, 2019
Overview
----------------------------------------
Set limit for activity_contact retrieval to 0, allowing to retrieve more than 25 activity contacts when rendering the first 25 activities on the activity contact tab

Before
----------------------------------------
![before](https://user-images.githubusercontent.com/336308/57439801-e42a0580-729a-11e9-80a1-45df93d0c5eb.jpg)

After
----------------------------------------
![after](https://user-images.githubusercontent.com/336308/57439960-39fead80-729b-11e9-9701-acd79ff73497.jpg)

Technical Details
----------------------------------------
This moves the logic for retrieving the target contacts back into the getActivities function. We are stil not wanting to bypass the ACLs so still using the
api but strictly limiting the number of contacts we retrieve (at the cost of extra queries, but cheap ones).

Some tests added on the Bulk Mail activity.

Comments
----------------------------------------
@seamuslee001
Copy link
Contributor

@eileenmcnaughton need name fix here

@seamuslee001
Copy link
Contributor

Jenkins re test this please

@seamuslee001
Copy link
Contributor

I've cherry-picked my test fix from #14236 to this ping @totten

@seamuslee001
Copy link
Contributor

@eileenmcnaughton do you want to rebase this to squish the extra commits?

@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 would do but have to take R to get stitched up - cut finger - can you - or just merge

@seamuslee001
Copy link
Contributor

I'm going to merge based on Eileen's comment

@seamuslee001 seamuslee001 merged commit 8762c31 into civicrm:5.13 May 12, 2019
@seamuslee001 seamuslee001 deleted the 513-3 branch May 12, 2019 00:45
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.

2 participants