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-21744 fix proximity search to work with smart groups #11645

Merged
merged 1 commit into from
Feb 8, 2018

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Feb 7, 2018

Overview

Fix proximity search to work with smart groups

Before

When using the proximity search it allows a smart group to be selected, but if you DO select one then it returns 0 results

After

The proximity search appropriately filters by smart groups

Technical Details

On analysing the search I decided that the the functionality was created in the search & then later exposed in Advanced search / the main query object, leaving the proximity search as just a subset of the advanced search. I decided rather than recreate the smart group logic I would simply point it the main Query object & remove the wrangling from the Proximity search

Comments

This is the last of my geocoding ones I think :-) Further work in an extension. I will rebase once #11643 & #11543 are merged


@aydun
Copy link
Contributor

aydun commented Feb 7, 2018

Tested - results are limited to the smart group, as intended. Looks ok.

@eileenmcnaughton
Copy link
Contributor Author

@aydun is this OK for merge on pass?

Note it's pretty obscure functionality so I think a bit of UI testing should suffice

@aydun
Copy link
Contributor

aydun commented Feb 7, 2018

FYI - I note that search results can be selected (checkboxes on left), but the '0 records selected' does not change and the actions drop-down is not available. But that is the same on previous versions so not caused by this PR and not related to smart groups.

@aydun
Copy link
Contributor

aydun commented Feb 7, 2018

Yes, ok to merge on pass

@eileenmcnaughton
Copy link
Contributor Author

Merging based on @aydun review - per above - this is a pretty obscure corner of Civi & we will be testing this specifically on the rc

@eileenmcnaughton eileenmcnaughton merged commit 8377705 into civicrm:master Feb 8, 2018
@eileenmcnaughton eileenmcnaughton deleted the prox_smart_group branch February 8, 2018 00:33
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants