From 885d25ac831207b0d8eb0bb0e74ce9a30f738c17 Mon Sep 17 00:00:00 2001 From: "deb.monish" Date: Wed, 1 Nov 2017 23:00:37 +0530 Subject: [PATCH] remove special sort order handling for dashlet --- CRM/Activity/BAO/Activity.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index 5a42666f00..05c3f6bb31 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -757,13 +757,7 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { } } - if (empty($order)) { - // context = 'activity' in Activities tab. - $activityParams['options']['sort'] = (CRM_Utils_Array::value('context', $params) == 'activity') ? "activity_date_time DESC" : "status_id ASC, activity_date_time ASC"; - } - else { - $activityParams['options']['sort'] = str_replace('activity_type ', 'activity_type_id.label ', $order); - } + $activityParams['options']['sort'] = empty($order) ? "activity_date_time DESC" : str_replace('activity_type ', 'activity_type_id.label ', $order); //TODO : // 1. we should use Activity.Getcount for fetching count only, but in order to check that @@ -955,7 +949,7 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { if (empty($order)) { // context = 'activity' in Activities tab. - $order = (CRM_Utils_Array::value('context', $input) == 'activity') ? " ORDER BY tbl.activity_date_time desc " : " ORDER BY tbl.status_id asc, tbl.activity_date_time asc "; + $order = " ORDER BY tbl.activity_date_time desc "; } if (!empty($input['rowCount']) && -- 2.25.1