From c3c679b06dbc35f5e52693a26c909d1f407538a2 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 27 Sep 2018 20:35:55 -0400 Subject: [PATCH] Update activity_tab_filter setting code to use new fascade --- CRM/Activity/Form/ActivityFilter.php | 6 ++---- CRM/Activity/Page/AJAX.php | 6 +----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/CRM/Activity/Form/ActivityFilter.php b/CRM/Activity/Form/ActivityFilter.php index 791df3ff0b..eda3efe1ad 100644 --- a/CRM/Activity/Form/ActivityFilter.php +++ b/CRM/Activity/Form/ActivityFilter.php @@ -67,10 +67,8 @@ class CRM_Activity_Form_ActivityFilter extends CRM_Core_Form { public function setDefaultValues() { // CRM-11761 retrieve user's activity filter preferences $defaults = array(); - if (Civi::settings()->get('preserve_activity_tab_filter') && ($userID = CRM_Core_Session::getLoggedInContactID())) { - $defaults = Civi::service('settings_manager') - ->getBagByContact(NULL, $userID) - ->get('activity_tab_filter'); + if (Civi::settings()->get('preserve_activity_tab_filter') && (CRM_Core_Session::getLoggedInContactID())) { + $defaults = Civi::contactSettings()->get('activity_tab_filter'); } // set Activity status 'Scheduled' by default only for dashlet elseif (strstr(CRM_Utils_Array::value('q', $_GET), 'dashlet')) { diff --git a/CRM/Activity/Page/AJAX.php b/CRM/Activity/Page/AJAX.php index 4a53288813..b4ef64cf8f 100644 --- a/CRM/Activity/Page/AJAX.php +++ b/CRM/Activity/Page/AJAX.php @@ -453,11 +453,7 @@ class CRM_Activity_Page_AJAX { } } - /** - * @var \Civi\Core\SettingsBag $cSettings - */ - $cSettings = Civi::service('settings_manager')->getBagByContact(CRM_Core_Config::domainID(), $userID); - $cSettings->set('activity_tab_filter', $activityFilter); + Civi::contactSettings()->set('activity_tab_filter', $activityFilter); } if (!empty($_GET['is_unit_test'])) { return array($activities, $activityFilter); -- 2.25.1