jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/381921 )
Change subject: CRM--21248 Fix merge screen conflict listing ...................................................................... CRM--21248 Fix merge screen conflict listing Bug: T176256 (a bit tangental but experienced while investigating). Adding to https://github.com/civicrm/civicrm-core/pull/11030 Change-Id: If606536337746fd12e16a9a38ca16275e6757f9c --- M CRM/Contact/Page/DedupeFind.php M CRM/Contact/Page/DedupeMerge.php 2 files changed, 5 insertions(+), 7 deletions(-) Approvals: Mepps: Looks good to me, approved jenkins-bot: Verified diff --git a/CRM/Contact/Page/DedupeFind.php b/CRM/Contact/Page/DedupeFind.php index 41fa2ea..db1d263 100644 --- a/CRM/Contact/Page/DedupeFind.php +++ b/CRM/Contact/Page/DedupeFind.php @@ -64,6 +64,7 @@ $rgid = CRM_Utils_Request::retrieve('rgid', 'Positive', $this); $cid = CRM_Utils_Request::retrieve('cid', 'Positive', $this, FALSE, 0); $criteria = CRM_Utils_Request::retrieve('criteria', 'String', $this, FALSE, '{}'); + $isSelected = CRM_Utils_Request::retrieve('is_selected', 'Int', $this, FALSE, 2); $this->assign('criteria', $criteria); $isConflictMode = ($context == 'conflicts'); @@ -141,9 +142,6 @@ $this->action = CRM_Core_Action::UPDATE; $urlQry['snippet'] = 4; - if ($isConflictMode) { - $urlQry['selected'] = 1; - } $this->assign('sourceUrl', CRM_Utils_System::url('civicrm/ajax/dedupefind', $urlQry, FALSE, NULL, FALSE)); @@ -157,7 +155,7 @@ CRM_Dedupe_Merger::resetMergeStats($cacheKeyString); } - $this->_mainContacts = CRM_Dedupe_Merger::getDuplicatePairs($rgid, $gid, !$isConflictMode, 0, $isConflictMode, '', $isConflictMode, $criteria, TRUE, $limit); + $this->_mainContacts = CRM_Dedupe_Merger::getDuplicatePairs($rgid, $gid, !$isConflictMode, 0, $isSelected, '', $isConflictMode, $criteria, TRUE, $limit); if (empty($this->_mainContacts)) { if ($isConflictMode) { diff --git a/CRM/Contact/Page/DedupeMerge.php b/CRM/Contact/Page/DedupeMerge.php index da12d9b..4d26b1d 100644 --- a/CRM/Contact/Page/DedupeMerge.php +++ b/CRM/Contact/Page/DedupeMerge.php @@ -88,11 +88,11 @@ $where = NULL; if ($action == CRM_Core_Action::MAP) { $where = "pn.is_selected = 1"; - $isSelected = 1; + $urlQry['is_selected'] = 1; } else { // else merge all (2) - $isSelected = 2; + $urlQry['is_selected'] = 2; } $total = CRM_Core_BAO_PrevNextCache::getCount($cacheKeyString, NULL, $where); @@ -107,7 +107,7 @@ for ($i = 1; $i <= ceil($total / self::BATCHLIMIT); $i++) { $task = new CRM_Queue_Task( array('CRM_Contact_Page_DedupeMerge', 'callBatchMerge'), - array($rgid, $gid, $mode, self::BATCHLIMIT, $isSelected), + array($rgid, $gid, $mode, self::BATCHLIMIT, $urlQry['is_selected']), "Processed " . $i * self::BATCHLIMIT . " pair of duplicates out of " . $total ); -- To view, visit https://gerrit.wikimedia.org/r/381921 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If606536337746fd12e16a9a38ca16275e6757f9c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm/civicrm Gerrit-Branch: master Gerrit-Owner: Eileen <emcnaugh...@wikimedia.org> Gerrit-Reviewer: Ejegg <ej...@ejegg.com> Gerrit-Reviewer: Mepps <me...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
