From febb6506255bac0413883c0541dcf091e4995365 Mon Sep 17 00:00:00 2001
From: Joseph Lacey <joseph@palantetech.coop>
Date: Tue, 15 Dec 2015 12:56:30 -0500
Subject: [PATCH] CRM-16353 - Bug fixes to broken inline editing for a few
 already migrated datatables pages

----------------------------------------
* CRM-16353: Upgrade datatables integration to use v2 api
  https://issues.civicrm.org/jira/browse/CRM-16353
---
 CRM/Activity/BAO/Activity.php    | 7 ++++---
 CRM/Case/BAO/Case.php            | 7 ++++---
 CRM/Contact/BAO/Relationship.php | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 591f77991e..f5a5a0ac46 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -2491,6 +2491,7 @@ INNER JOIN  civicrm_option_group grp ON ( grp.id = val.option_group_id AND grp.n
 
       foreach ($activities as $activityId => $values) {
         $activity = array();
+        $activity['DT_RowId'] = $activityId;
         // Add class to this row if overdue.
         $activity['DT_RowClass'] = 'crm-entity';
         if (CRM_Utils_Date::overdue(CRM_Utils_Array::value('activity_date_time', $values))
@@ -2502,9 +2503,9 @@ INNER JOIN  civicrm_option_group grp ON ( grp.id = val.option_group_id AND grp.n
           $activity['DT_RowClass'] .= ' status-ontime';
         }
 
-        $activity['DT_RowData'] = array();
-        $activity['DT_RowData']['entity'] = 'activity';
-        $activity['DT_RowData']['id'] = $activityId;
+        $activity['DT_RowAttr'] = array();
+        $activity['DT_RowAttr']['data-entity'] = 'activity';
+        $activity['DT_RowAttr']['data-id'] = $activityId;
 
         $activity['activity_type'] = $values['activity_type'];
         $activity['subject'] = $values['subject'];
diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
index 854ec01a6a..c81fcf48fd 100644
--- a/CRM/Case/BAO/Case.php
+++ b/CRM/Case/BAO/Case.php
@@ -1250,6 +1250,7 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
         continue;
       }
 
+      $caseActivity['DT_RowId'] = $caseActivityId;
       //Add classes to the row, via DataTables syntax
       $caseActivity['DT_RowClass'] = "crm-entity";
 
@@ -1275,9 +1276,9 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
       }
 
       //Add data to the row for inline editing, via DataTable syntax
-      $caseActivity['DT_RowData'] = array();
-      $caseActivity['DT_RowData']['entity'] = 'activity';
-      $caseActivity['DT_RowData']['id'] = $caseActivityId;
+      $caseActivity['DT_RowAttr'] = array();
+      $caseActivity['DT_RowAttr']['data-entity'] = 'activity';
+      $caseActivity['DT_RowAttr']['data-id'] = $caseActivityId;
 
       //Activity Date and Time
       $caseActivity['activity_date_time'] = CRM_Utils_Date::customFormat($dao->display_date);
diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php
index 065a88ca3f..8f4c19f378 100644
--- a/CRM/Contact/BAO/Relationship.php
+++ b/CRM/Contact/BAO/Relationship.php
@@ -2038,14 +2038,15 @@ AND cc.sort_name LIKE '%$name%'";
       foreach ($relationships as $relationshipId => $values) {
         $relationship = array();
 
+        $relationship['DT_RowId'] = $values['id'];
         $relationship['DT_RowClass'] = 'crm-entity';
         if ($values['is_active'] == 0) {
           $relationship['DT_RowClass'] .= ' disabled';
         }
 
-        $relationship['DT_RowData'] = array();
-        $relationship['DT_RowData']['entity'] = 'relationship';
-        $relationship['DT_RowData']['id'] = $values['id'];
+        $relationship['DT_RowAttr'] = array();
+        $relationship['DT_RowAttr']['data-entity'] = 'relationship';
+        $relationship['DT_RowAttr']['data-id'] = $values['id'];
 
         //Add image icon for related contacts: CRM-14919
         $icon = CRM_Contact_BAO_Contact_Utils::getImage($values['contact_type'],
-- 
2.25.1