Fix display of conflicts on duplicate screen.
authoreileen <emcnaughton@wikimedia.org>
Thu, 24 May 2018 04:44:07 +0000 (16:44 +1200)
committereileen <emcnaughton@wikimedia.org>
Tue, 5 Jun 2018 08:13:18 +0000 (20:13 +1200)
commitbb22928bbdc1f2da6e1529a396905fbb37a8e30d
tree27923e8530b473364ad8a531fe344d3c3a34ceeb
parentf59c376bdc5ebada1f0744de49e83c221825e3be
Fix display of conflicts on duplicate screen.

There are 2 bulk dedupe scenarios
1) dedupe selected
2) dedupe all

In the case of the former, but not the latter, the display to which contacts
are redirected should be filted by 'selected'

Currently the selected filter is being applied whenever conflicts is true, resulting in an
empty form in the latter case.

This fix disambiguates the 2 concepts & attempts to rationalise & clarify related parameters in the flow.
CRM/Contact/Page/AJAX.php
CRM/Contact/Page/DedupeFind.php
CRM/Contact/Page/DedupeMerge.php
CRM/Dedupe/Merger.php
templates/CRM/Contact/Page/DedupeFind.tpl