From bff3913a980b11cc8929ab5c18b6cef4d8b96599 Mon Sep 17 00:00:00 2001
From: Joseph Lacey <joseph@palantetech.coop>
Date: Wed, 29 Apr 2015 20:42:11 -0600
Subject: [PATCH] CRM-16353 - Remaining Contact DataTables refactoring, in
 addition to initial refactoring

----------------------------------------
* CRM-16353: Upgrade datatables integration to use v2 api
  https://issues.civicrm.org/jira/browse/CRM-16353
---
 CRM/Contact/Form/DedupeRules.php              |  2 +-
 templates/CRM/Activity/Selector/Selector.tpl  |  2 +-
 .../CRM/Contact/Page/DedupeException.tpl      | 48 +++++++------------
 templates/CRM/Contact/Page/View/Note.tpl      | 28 ++---------
 4 files changed, 24 insertions(+), 56 deletions(-)

diff --git a/CRM/Contact/Form/DedupeRules.php b/CRM/Contact/Form/DedupeRules.php
index d7df3d47d0..6d487960f9 100644
--- a/CRM/Contact/Form/DedupeRules.php
+++ b/CRM/Contact/Form/DedupeRules.php
@@ -115,7 +115,7 @@ class CRM_Contact_Form_DedupeRules extends CRM_Admin_Form {
     $disabled = array();
     $reserved = $this->addField('is_reserved', array('label' => ts('Reserved?')));
     if (!empty($this->_defaults['is_reserved'])) {
-      $reserved->freeze();
+      //$reserved->freeze();
       $disabled = array('disabled' => TRUE);
     }
 
diff --git a/templates/CRM/Activity/Selector/Selector.tpl b/templates/CRM/Activity/Selector/Selector.tpl
index 8061466bf6..f6a214dc73 100644
--- a/templates/CRM/Activity/Selector/Selector.tpl
+++ b/templates/CRM/Activity/Selector/Selector.tpl
@@ -44,7 +44,7 @@
     <thead>
     <tr>
       <th data-data="activity_type" class="crm-contact-activity-activity_type">{ts}Type{/ts}</th>
-      <th data-data="subject" cell-class="crmf-subject crm-editable" cell-data-type="text" class="crm-contact-activity_subject">{ts}Subject{/ts}</th>
+      <th data-data="subject" cell-class="crmf-subject crm-editable" class="crm-contact-activity_subject">{ts}Subject{/ts}</th>
       <th data-data="source_contact_name" class="crm-contact-activity-source_contact">{ts}Added By{/ts}</th>
       <th data-data="target_contact_name" data-orderable="false" class="crm-contact-activity-target_contact">{ts}With{/ts}</th>
       <th data-data="assignee_contact_name" data-orderable="false" class="crm-contact-activity-assignee_contact">{ts}Assigned{/ts}</th>
diff --git a/templates/CRM/Contact/Page/DedupeException.tpl b/templates/CRM/Contact/Page/DedupeException.tpl
index 396e45f140..c22d547d04 100644
--- a/templates/CRM/Contact/Page/DedupeException.tpl
+++ b/templates/CRM/Contact/Page/DedupeException.tpl
@@ -24,40 +24,28 @@
  +--------------------------------------------------------------------+
 *}
 
-<table id="dedupeExceptions" class="display">
-    <thead>
-       <tr class="columnheader">
-          <th>{ts}Contact 1{/ts}</th>
-          <th>{ts}Contact 2 (Duplicate){/ts}</th>
-    <th></th>
-       </tr>
-    </thead>
-    <tbody>
-       {foreach from=$dedupeExceptions item=exception key=id}
-       <tr id="dupeRow_{$id}" class="{cycle values="odd-row,even-row"}">
-     <td>{$exception.main.name}</td>
-     <td>{$exception.other.name}</td>
-     <td><a id='duplicateContacts' href="#" title={ts}Remove Exception{/ts} onClick="processDupes( {$exception.main.id}, {$exception.other.id}, 'nondupe-dupe', 'dedupe-exception' );return false;">&raquo; {ts}Remove Exception{/ts}</a></td>
-       </tr>
-       {/foreach}
-    </tbody>
+<table id="dedupeExceptions" class="display crm-sortable">
+  <thead>
+    <tr class="columnheader">
+      <th>{ts}Contact 1{/ts}</th>
+      <th>{ts}Contact 2 (Duplicate){/ts}</th>
+      <th data-orderable="false"></th>
+    </tr>
+  </thead>
+  <tbody>
+    {foreach from=$dedupeExceptions item=exception key=id}
+      <tr id="dupeRow_{$id}" class="{cycle values="odd-row,even-row"}">
+        <td>{$exception.main.name}</td>
+        <td>{$exception.other.name}</td>
+        <td><a id='duplicateContacts' href="#" title={ts}Remove Exception{/ts} onClick="processDupes( {$exception.main.id}, {$exception.other.id}, 'nondupe-dupe', 'dedupe-exception' );return false;">&raquo; {ts}Remove Exception{/ts}</a></td>
+      </tr>
+    {/foreach}
+  </tbody>
 </table>
 <div class="clear"><br /></div>
 <div class="action-link">
-    {crmButton p="civicrm/contact/deduperules" q="reset=1" icon="close"}{ts}Done{/ts}{/crmButton}
+  {crmButton p="civicrm/contact/deduperules" q="reset=1" icon="close"}{ts}Done{/ts}{/crmButton}
 </div>
 
-
-{literal}
-<script type="text/javascript">
-  //load jQuery data table.
-        cj('#dedupeExceptions').dataTable( {
-    "sPaginationType": "full_numbers",
-    "aaSorting": [[0,'asc'], [1,'asc']],
-    "aoColumns": [{sClass:""},{sClass:""},{bSortable:false}],
-        });
-</script>
-{/literal}
-
 {* process the dupe contacts *}
 {include file="CRM/common/dedupe.tpl"}
diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl
index fd581fc015..22fc2fe36b 100644
--- a/templates/CRM/Contact/Page/View/Note.tpl
+++ b/templates/CRM/Contact/Page/View/Note.tpl
@@ -202,36 +202,16 @@
 {* show browse table for any action *}
 <div id="notes">
     {strip}
-    {include file="CRM/common/jsortable.tpl"}
-
-    <script type="text/javascript">
-    {literal}
-      CRM.$(function($) {
-        var tabId = $('.dataTable').attr('id');
-
-        $('table#'+ tabId).dataTable().fnSettings().aoDrawCallback.push( {
-          "fn": function () {
-            $('#'+ tabId +' tr').each( function() {
-              drawCommentRows(this.id)
-            });
-          },
-          "sName": "user"
-        } );
-      });
-
-    {/literal}
-    </script>
-
-        <table id="options" class="display">
+        <table id="options" class="display crm-sortable" data-order='[[3,"desc"]]'>
         <thead>
         <tr>
-          <th></th>
+          <th data-orderable="false"></th>
           <th>{ts}Note{/ts}</th>
           <th>{ts}Subject{/ts}</th>
           <th>{ts}Date{/ts}</th>
           <th>{ts}Created By{/ts}</th>
-          <th>{ts}Attachment(s){/ts}</th>
-          <th></th>
+          <th data-orderable="false">{ts}Attachment(s){/ts}</th>
+          <th data-orderable="false"></th>
         </tr>
         </thead>
 
-- 
2.25.1