From 6d13d1c49a989755ad360d212e695e1f610a7710 Mon Sep 17 00:00:00 2001
From: Mathieu Lutfy <mathieu@symbiotic.coop>
Date: Fri, 3 May 2019 09:09:25 -0400
Subject: [PATCH] dev/core#932 Fix dedupe contacts flip selection
---
CRM/Contact/Page/AJAX.php | 5 ++++-
templates/CRM/Contact/Page/DedupeFind.tpl | 6 ++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php
index f354d12bea9..a0df0b92ddb 100644
--- a/CRM/Contact/Page/AJAX.php
+++ b/CRM/Contact/Page/AJAX.php
@@ -938,7 +938,10 @@ LIMIT {$offset}, {$rowCount}
public static function flipDupePairs($prevNextId = NULL) {
if (!$prevNextId) {
// @todo figure out if this is always POST & specify that rather than inexact GET
- $prevNextId = CRM_Utils_Request::retrieve('pnid', 'Integer');
+
+ // We cannot use CRM_Utils_Request::retrieve() because it might be an array.
+ // It later gets validated in escapeAll below.
+ $prevNextId = $_REQUEST['pnid'];
}
$onlySelected = FALSE;
diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl b/templates/CRM/Contact/Page/DedupeFind.tpl
index a4b54c3f895..b7a411ad393 100644
--- a/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -282,6 +282,7 @@
});
$(".crm-dedupe-flip-selections").on('click', function(e) {
+ e.preventDefault();
var ids = [];
$('.crm-row-selected').each(function() {
var ele = CRM.$('input.crm-dedupe-select', this);
@@ -289,7 +290,8 @@
});
if (ids.length > 0) {
var dataUrl = {/literal}"{crmURL p='civicrm/ajax/flipDupePairs' h=0 q='snippet=4'}"{literal};
- CRM.$.post(dataUrl, {pnid: ids}, function (response) {
+ var request = $.post(dataUrl, {pnid: ids});
+ request.done(function(dt) {
var mapper = {1:3, 2:4, 5:6, 7:8, 9:10}
$('.crm-row-selected').each(function() {
var idx = $('table#dupePairs').DataTable().row(this).index();
@@ -302,7 +304,7 @@
// keep the checkbox checked if needed
$('input.crm-dedupe-select', this).prop('checked', $(this).hasClass('crm-row-selected'));
});
- }, 'json');
+ });
}
});
});
--
GitLab