From c00bd20144f6298cc593c8ea41a175a95a01883b Mon Sep 17 00:00:00 2001
From: "deb.monish" <monish.deb@jmaconsulting.biz>
Date: Mon, 18 Dec 2017 19:02:35 +0530
Subject: [PATCH] fix datatable error

---
 CRM/Case/BAO/Case.php  | 20 +++++++-------------
 CRM/Case/BAO/Query.php |  5 +----
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
index 45d0dcabf1..4a6ddd38b0 100644
--- a/CRM/Case/BAO/Case.php
+++ b/CRM/Case/BAO/Case.php
@@ -699,14 +699,8 @@ LEFT JOIN civicrm_option_group aog ON aog.name='activity_type'
       $casesList[$key]['case_status'] = in_array($case['case_status'], $caseStatus) ? sprintf('<strong>%s</strong>', strtoupper($case['case_status'])) : $case['case_status'];
       $casesList[$key]['case_type'] = $case['case_type'];
       $casesList[$key]['case_role'] = CRM_Utils_Array::value('case_role', $case, '---');
+      $casesList[$key]['manager'] = self::getCaseManagerContact($caseTypes[$case['case_type_id']], $case['case_id']);
 
-      $caseManagerContact = self::getCaseManagerContact($caseTypes[$case['case_type_id']], $case['case_id']);
-      if (!empty($caseManagerContact)) {
-        $casesList[$key]['manager'] = sprintf('<a href="%s">%s</a>',
-          CRM_Utils_System::url('civicrm/contact/view', array('cid' => CRM_Utils_Array::value('casemanager_id', $caseManagerContact))),
-          CRM_Utils_Array::value('casemanager', $caseManagerContact)
-        );
-      }
       $casesList[$key]['date'] = $case[$caseActivityTypeColumn];
       if (($actId = CRM_Utils_Array::value('case_scheduled_activity_id', $case)) ||
         ($actId = CRM_Utils_Array::value('case_recent_activity_id', $case))
@@ -1886,8 +1880,8 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
    * @param int $caseId
    *   Case id.
    *
-   * @return array
-   *   array of contact on success otherwise empty
+   * @return string
+   *   html hyperlink of manager contact view page
    *
    */
   public static function getCaseManagerContact($caseType, $caseId) {
@@ -1916,12 +1910,12 @@ SELECT civicrm_contact.id as casemanager_id,
 
       $dao = CRM_Core_DAO::executeQuery($managerRoleQuery, $managerRoleParams);
       if ($dao->fetch()) {
-        $caseManagerContact['casemanager_id'] = $dao->casemanager_id;
-        $caseManagerContact['casemanager'] = $dao->casemanager;
+        return sprintf('<a href="%s">%s</a>',
+          CRM_Utils_System::url('civicrm/contact/view', array('cid' => $dao->casemanager_id)),
+          $dao->casemanager
+        );
       }
     }
-
-    return $caseManagerContact;
   }
 
   /**
diff --git a/CRM/Case/BAO/Query.php b/CRM/Case/BAO/Query.php
index 5c9dd702b2..753702893f 100644
--- a/CRM/Case/BAO/Query.php
+++ b/CRM/Case/BAO/Query.php
@@ -729,10 +729,7 @@ case_relation_type.id = case_relationship.relationship_type_id )";
 
     self::addCustomFormFields($form, array('Case'));
 
-    $form->setDefaults(array(
-      'case_owner' => 1,
-      'upcoming' => 1,
-    ));
+    $form->setDefaults(array('case_owner' => 1));
   }
 
   /**
-- 
2.25.1