From 1595de3866d458e3813feeeb8ec0f2a033f6da87 Mon Sep 17 00:00:00 2001
From: Kajan <kajan@vedaconsulting.co.uk>
Date: Mon, 20 Apr 2015 10:59:30 +0100
Subject: [PATCH] Genere

al search and conflict then show conflict column
---
 CRM/Contact/Page/AJAX.php                 | 15 +++++++++++++++
 templates/CRM/Contact/Page/DedupeFind.tpl |  7 +++++++
 2 files changed, 22 insertions(+)

diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php
index 5c6a0e4313e1..c8c34160a81b 100644
--- a/CRM/Contact/Page/AJAX.php
+++ b/CRM/Contact/Page/AJAX.php
@@ -781,8 +781,10 @@ static function getDedupes() {
     
     $select = array(
       'cc1.contact_type'    => 'src_contact_type',
+      'cc1.display_name'    => 'src_display_name',
       'cc1.contact_sub_type'=> 'src_contact_sub_type',
       'cc2.contact_type'    => 'dst_contact_type',
+      'cc2.display_name'    => 'dst_display_name',
       'cc2.contact_sub_type'=> 'dst_contact_sub_type',
       'ce1.email'           => 'src_email',
       'ce2.email'           => 'dst_email',
@@ -840,6 +842,19 @@ static function getDedupes() {
       }
     }
     
+    $searchData = CRM_Utils_Array::value('search', $_REQUEST);
+    
+    if (!empty($searchData['value'])) {
+      $where .= " AND
+          ((cc1.display_name LIKE '%{$searchData['value']}%') OR
+          (ce1.email LIKE '%{$searchData['value']}%') OR
+          (ca1.street_address LIKE '%{$searchData['value']}%') OR
+          (ca1.postal_code LIKE '%{$searchData['value']}%') OR
+          (cc2.display_name LIKE '%{$searchData['value']}%') OR
+          (ce2.email LIKE '%{$searchData['value']}%') OR
+          (ca2.street_address LIKE '%{$searchData['value']}%') OR
+          (ca2.postal_code LIKE '%{$searchData['value']}%')) ";
+    }
     $dupePairs = CRM_Core_BAO_PrevNextCache::retrieve($cacheKeyString, $join, $where, $offset, $rowCount, $select);
     $iFilteredTotal = CRM_Core_DAO::singleValueQuery("SELECT FOUND_ROWS()");
 
diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl b/templates/CRM/Contact/Page/DedupeFind.tpl
index 4cf5528a5ed3..c5602a4abca4 100644
--- a/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -180,6 +180,7 @@
 <script type="text/javascript">
 CRM.$(function($) {
   var sourceUrl = {/literal}'{$sourceUrl}'{literal};
+  var context   = {/literal}'{$context}'{literal};
   $('#dupePairs').dataTable({
     //"scrollX": true, // doesn't work with hover popup for for icons
     "lengthMenu": [[10, 25, 50, 100, 1000, 2000, -1], [10, 25, 50, 100, 1000, 2000, "All"]],
@@ -262,6 +263,12 @@ CRM.$(function($) {
       column.visible( ! column.visible() );
     }
   });
+  
+  if(context == 'conflicts') {
+      $('#conflicts').attr('checked', true);  
+      var column = table.column( $('#conflicts').attr('data-column-main') );
+      column.visible( ! column.visible() );
+  }
 });
 
 function toggleDedupeSelect(element) {