Merge pull request civicrm#12 from mathavanveda/dedupe-workflow-45-tr…

…-highlight display opnly selected contacts checkbox
veda-consulting · Apr 23, 2015 · e2839fc · e2839fc
2 parents 8a9576a + c1f2f6f
commit e2839fc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php
@@ -700,7 +700,7 @@ static function getDedupes() {
 
     $gid         = isset($_REQUEST['gid']) ? CRM_Utils_Type::escape($_REQUEST['gid'], 'Integer') : 0;
     $rgid        = isset($_REQUEST['rgid']) ? CRM_Utils_Type::escape($_REQUEST['rgid'], 'Integer') : 0;
-    $selected    = isset($_REQUEST['selected']) ? 1 : 0;
+    $selected    = isset($_REQUEST['selected']) ? $_REQUEST['selected'] : 0;
     if ($rowCount < 0) {
       if ($rowCount == -1) {
         $selected = 1;

diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl b/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -81,6 +81,10 @@
     <input type='checkbox' id ='threshold' class='toggle-vis' data-column-main="12"  >  
         <label for="threshold">{ts}Threshold{/ts}&nbsp;</label>
   </div><br/>
+  <div id="crm-dedupe-display-selected-div" style="float:right;">
+    <input type='checkbox' id ='crm-dedupe-display-selected' class='crm-dedupe-display-selected' name="display-selected">
+    <label for="display-selected">{ts}Show Only selected{/ts}&nbsp;</label>  
+  </div>
   <table id="dupePairs" class="nestedActivitySelector form-layout-compressed" cellspacing="0" width="100%">
     <thead>
       <tr class="columnheader"> 
@@ -181,6 +185,13 @@
 CRM.$(function($) {
   var sourceUrl = {/literal}'{$sourceUrl}'{literal};
   var context   = {/literal}'{$context}'{literal};
+  $('#crm-dedupe-display-selected').on('click', function(){
+    reloadUrl = sourceUrl;
+    if($(this).prop('checked')){
+      reloadUrl = sourceUrl+'&selected=1';
+    }
+    $('#dupePairs').DataTable().ajax.url(reloadUrl).load();
+  });
   $('#dupePairs').dataTable({
     //"scrollX": true, // doesn't work with hover popup for for icons
     "lengthMenu": [[10, 25, 50, 100, 1000, 2000, -1, -2], [10, 25, 50, 100, 1000, 2000, "All Selected", "All"]],
@@ -226,6 +237,8 @@ CRM.$(function($) {
     }
   });
 
+  $('#crm-dedupe-display-selected-div').appendTo('#dupePairs_length');
+
   // apply selected class on click of a row
   $('#dupePairs tbody').on('click', 'tr', function() {
     $(this).toggleClass('crm-row-selected');