From 21f96d9b2fcc5633d44824325432e387bc8e2204 Mon Sep 17 00:00:00 2001
From: Kevin Levie <kevin@levity.nl>
Date: Wed, 19 Aug 2015 06:34:09 +0200
Subject: [PATCH] Fix sorting by date in datatables

---
 templates/CRM/Contact/Page/View/GroupContact.tpl |  4 ++--
 templates/CRM/Contact/Page/View/Note.tpl         |  2 +-
 templates/CRM/Event/Form/ManageEvent/Repeat.tpl  |  4 ++--
 templates/CRM/Event/Page/ManageEvent.tpl         |  4 ++--
 templates/CRM/Member/Form/MembershipRelated.tpl  |  4 ++--
 templates/CRM/Member/Page/Tab.tpl                | 10 +++++-----
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/templates/CRM/Contact/Page/View/GroupContact.tpl b/templates/CRM/Contact/Page/View/GroupContact.tpl
index e8a80c89d1..ebf7264057 100644
--- a/templates/CRM/Contact/Page/View/GroupContact.tpl
+++ b/templates/CRM/Contact/Page/View/GroupContact.tpl
@@ -152,8 +152,8 @@
               </a>
             </td>
             <td class="status-removed">{ts 1=$row.out_method}Removed (by %1){/ts}</td>
-            <td>{$row.date_added|crmDate}</td>
-            <td>{$row.out_date|crmDate}</td>
+            <td data-order="{$row.date_added}">{$row.date_added|crmDate}</td>
+            <td data-order="{$row.out_date}">{$row.out_date|crmDate}</td>
             <td>{if $permission EQ 'edit'}
                 <a class="action-item crm-hover-button" href="#Added" title="{ts 1=$displayName 2=$row.title}Add %1 back into %2?{/ts}">
                   {ts}Rejoin Group{/ts}</a>
diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl
index 1bc63cb9fe..fda7ceb3de 100644
--- a/templates/CRM/Contact/Page/View/Note.tpl
+++ b/templates/CRM/Contact/Page/View/Note.tpl
@@ -238,7 +238,7 @@
                 {/if}
             </td>
             <td class="crm-note-subject">{$note.subject}</td>
-            <td class="crm-note-modified_date">{$note.modified_date|crmDate}</td>
+            <td class="crm-note-modified_date" data-order="{$note.modified_date}">{$note.modified_date|crmDate}</td>
             <td class="crm-note-createdBy">
                 <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$note.contact_id`"}">{$note.createdBy}</a>
             </td>
diff --git a/templates/CRM/Event/Form/ManageEvent/Repeat.tpl b/templates/CRM/Event/Form/ManageEvent/Repeat.tpl
index 8ebcf77bc7..079ab6ec01 100644
--- a/templates/CRM/Event/Form/ManageEvent/Repeat.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Repeat.tpl
@@ -57,8 +57,8 @@
                title="{ts}View event info page{/ts}" class="bold">{$row.title}</a>&nbsp;&nbsp;({ts}ID:{/ts} {$row.id})
           </td>
           <td class="crm-event-is_public{$highlight}">{if $row.is_public eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-          <td class="crm-event-start_date{$highlight}">{$row.start_date|crmDate:"%b %d, %Y %l:%M %P"}</td>
-          <td class="crm-event-end_date{$highlight}">{$row.end_date|crmDate:"%b %d, %Y %l:%M %P"}</td>
+              <td class="crm-event-start_date{$highlight}" data-order="{$row.start_date|crmDate:'%Y-%m-%d'}">{$row.start_date|crmDate:"%b %d, %Y %l:%M %P"}</td>
+              <td class="crm-event-end_date{$highlight}" data-order="{$row.end_date|crmDate:'%Y-%m-%d'}">{$row.end_date|crmDate:"%b %d, %Y %l:%M %P"}</td>
           <td class="crm-event_status{$highlight}" id="row_{$row.id}_status">
             {if $row.is_active eq 1}{ts}Yes{/ts} {else} {ts}No{/ts} {/if}
           </td>
diff --git a/templates/CRM/Event/Page/ManageEvent.tpl b/templates/CRM/Event/Page/ManageEvent.tpl
index de39966455..1cb8d7f536 100644
--- a/templates/CRM/Event/Page/ManageEvent.tpl
+++ b/templates/CRM/Event/Page/ManageEvent.tpl
@@ -93,8 +93,8 @@
           <td class="crm-event-state_province">{$row.state_province}</td>
           <td class="crm-event-event_type">{$row.event_type}</td>
           <td class="crm-event-is_public">{if $row.is_public eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-          <td class="crm-event-start_date">{$row.start_date|crmDate:"%b %d, %Y %l:%M %P"}</td>
-          <td class="crm-event-end_date">{$row.end_date|crmDate:"%b %d, %Y %l:%M %P"}</td>
+          <td class="crm-event-start_date" data-order="{$row.start_date|crmDate:'%Y-%m-%d'}">{$row.start_date|crmDate:"%b %d, %Y %l:%M %P"}</td>
+          <td class="crm-event-end_date" data-order="{$row.end_date|crmDate:'%Y-%m-%d'}">{$row.end_date|crmDate:"%b %d, %Y %l:%M %P"}</td>
           {if call_user_func(array('CRM_Campaign_BAO_Campaign','isCampaignEnable'))}
             <td class="crm-event-campaign">{$row.campaign}</td>
           {/if}
diff --git a/templates/CRM/Member/Form/MembershipRelated.tpl b/templates/CRM/Member/Form/MembershipRelated.tpl
index 033394f75c..bb1fff88ec 100644
--- a/templates/CRM/Member/Form/MembershipRelated.tpl
+++ b/templates/CRM/Member/Form/MembershipRelated.tpl
@@ -47,8 +47,8 @@
                             <td>
                                 <a href="{crmURL p='civicrm/contact/view/rel' q="action=view&reset=1&selectedChild=rel&cid=`$rel.cid`&id=`$rel.id`"}">{$rel.relation}</a>
                             </td>
-                            <td>{$rel.start_date|crmDate}</td>
-                            <td>{$rel.end_date|crmDate}</td>
+                            <td data-order="{$rel.start_date}">{$rel.start_date|crmDate}</td>
+                            <td data-order="{$rel.end_date}">{$rel.end_date|crmDate}</td>
                             <td class="bold">
                                 <a href="{crmURL p='civicrm/contact/view' q="action=view&reset=1&cid=`$rel.cid`"}">{$rel.name}</a>
                             </td>
diff --git a/templates/CRM/Member/Page/Tab.tpl b/templates/CRM/Member/Page/Tab.tpl
index e4b2cb2552..07970fa4e3 100644
--- a/templates/CRM/Member/Page/Tab.tpl
+++ b/templates/CRM/Member/Page/Tab.tpl
@@ -89,9 +89,9 @@
                     {$activeMember.membership_type}
                     {if $activeMember.owner_membership_id}<br />({ts}by relationship{/ts}){/if}
                 </td>
-                <td class="crm-membership-join_date">{$activeMember.join_date|crmDate}</td>
-                <td class="crm-membership-start_date">{$activeMember.start_date|crmDate}</td>
-                <td class="crm-membership-end_date">{$activeMember.end_date|crmDate}</td>
+                <td class="crm-membership-join_date" data-order="{$activeMember.join_date}">{$activeMember.join_date|crmDate}</td>
+                <td class="crm-membership-start_date" data-order="{$activeMember.start_date}">{$activeMember.start_date|crmDate}</td>
+                <td class="crm-membership-end_date" data-order="{$activeMember.end_date}">{$activeMember.end_date|crmDate}</td>
                 <td class="crm-membership-status">{$activeMember.status}</td>
                 <td class="crm-membership-source">{$activeMember.source}</td>
                 <td class="crm-membership-auto_renew">{if $activeMember.auto_renew}<img src="{$config->resourceBase}i/check.gif" alt="{ts}Auto-renew{/ts}" /> {/if}</td>
@@ -131,8 +131,8 @@
                 <td class="crm-membership-membership_type">{$inActiveMember.membership_type}
         {if $inActiveMember.owner_membership_id}<br />({ts}by relationship{/ts}){/if}
     </td>
-                <td class="crm-membership-start_date">{$inActiveMember.start_date|crmDate}</td>
-                <td class="crm-membership-end_date">{$inActiveMember.end_date|crmDate}</td>
+                <td class="crm-membership-start_date" data-order="{$inActiveMember.start_date}">{$inActiveMember.start_date|crmDate}</td>
+                <td class="crm-membership-end_date" data-order="{$inActiveMember.end_date}">{$inActiveMember.end_date|crmDate}</td>
                 <td class="crm-membership-status">{$inActiveMember.status}</td>
                 <td class="crm-membership-source">{$inActiveMember.source}</td>
                 <td class="crm-membership-auto_renew">{if $inActiveMember.auto_renew}<img src="{$config->resourceBase}i/check.gif" alt="{ts}Auto-renew{/ts}" /> {/if}</td>
-- 
2.25.1