Re-add in the remove Exception function

diff --git a/api/v3/Exception.php b/api/v3/Exception.php
index 9c50d4a35c1b25f814591978ba90cea98c11aef1..8ed2ada6aca62a28f20d66e950071fc0a388aa34 100644 (file)
--- a/api/v3/Exception.php
+++ b/api/v3/Exception.php
@@ -47,6 +47,7 @@ function civicrm_api3_exception_get($params) {
 function civicrm_api3_exception_create($params) {
   return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'Exception');
 }
+
 /**
  * Delete an existing Exception.
  *

diff --git a/templates/CRM/Contact/Page/DedupeException.tpl b/templates/CRM/Contact/Page/DedupeException.tpl
index 2b4c34627606de510e8d126cd493ce9155aaf346..378de8b0d6271a4ca437f0168ffdd9b02359586a 100644 (file)
--- a/templates/CRM/Contact/Page/DedupeException.tpl
+++ b/templates/CRM/Contact/Page/DedupeException.tpl
@@ -23,6 +23,7 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
+{include file="CRM/common/dedupe.tpl"}
 <div class="crm-accordion-header">
   {ts}Filter Contacts{/ts}
 </div>
@@ -32,7 +33,7 @@
       <tr>
         <td class="crm-contact-form-block-contact1">
           <label for="search-contact1">{ts}Contact Name{/ts}</label><br />
-          <input type="text" size="50" placeholder="Search Contacts" value="{$searchcontact1}" id="search-contact1" search-column="0" />
+          <input class="crm-form-text" type="text" size="50" placeholder="Search Contacts" value="{$searchcontact1}" id="search-contact1" search-column="0" />
         </td>
         <td class="crm-contact-form-block-search">
           <label>&nbsp;</label><br />
@@ -51,16 +52,17 @@
   <div id="claim_level-wrapper" class="dataTables_wrapper">
     <table id="claim_level-table" class="display">
       <thead>
-      <tr>
-        <th>{ts}Contact 1{/ts}</th>
-        <th>{ts}Contact 2 (Duplicate){/ts}</th>
-      </tr>
+        <tr>
+          <th>{ts}Contact 1{/ts}</th>
+          <th>{ts}Contact 2 (Duplicate){/ts}</th>
+          <th data-orderable="false"></th>
+        </tr>
       </thead>
       <tbody>
-      {assign var="rowClass" value="odd-row"}
-      {assign var="rowCount" value=0}
+        {assign var="rowClass" value="odd-row"}
+        {assign var="rowCount" value=0}
 
-      {foreach from=$exceptions key=errorId item=exception}
+        {foreach from=$exceptions key=errorId item=exception}
         {assign var="rowCount" value=$rowCount+1}
 
         <tr id="row{$rowCount}" class="{cycle values="odd,even"}">
@@ -73,7 +75,9 @@
             {assign var="contact2name" value="contact_id2.display_name"}
             <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$exception.contact_id2`"}" target="_blank">{ $exception.$contact2name }</a>
           </td>
-
+          <td>
+            <a id='duplicateContacts' href="#" title={ts}Remove Exception{/ts} onClick="processDupes( {$exception.contact_id1}, {$exception.contact_id2}, 'nondupe-dupe', 'dedupe-exception' );return false;">&raquo; {ts}Remove Exception{/ts}</a>
+          </td>
         </tr>
 
         {if $rowClass eq "odd-row"}