Update activity_tab_filter setting code to use new fascade

diff --git a/CRM/Activity/Form/ActivityFilter.php b/CRM/Activity/Form/ActivityFilter.php
index 791df3ff0bb6142a25bad7503e5bd265fdc9c89a..eda3efe1adc83de6a9b8d0dfabd668b8d6d11820 100644 (file)
--- 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 4a53288813e26499bc25a0d86d354b681c7d4ff6..b4ef64cf8f238b019242e8a77f7c49fa3b84e3c8 100644 (file)
--- 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);