From 94b60b64c7b69bcb153646978480c017de22d145 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 11 Oct 2018 16:00:06 +0100
Subject: [PATCH] Convert user dashboard options

---
 CRM/Admin/Form/Preferences/Display.php           | 9 +++------
 settings/Core.setting.php                        | 3 ++-
 templates/CRM/Admin/Form/Preferences/Display.tpl | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CRM/Admin/Form/Preferences/Display.php b/CRM/Admin/Form/Preferences/Display.php
index 1db1863153..60c03f623d 100644
--- a/CRM/Admin/Form/Preferences/Display.php
+++ b/CRM/Admin/Form/Preferences/Display.php
@@ -40,8 +40,9 @@ class CRM_Admin_Form_Preferences_Display extends CRM_Admin_Form_Preferences {
     'contact_view_options' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'contact_smart_group_display' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'advanced_search_options' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
+    'user_dashboard_options' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'preserve_activity_tab_filter' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
-    'display_name_format' =>  CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
+    'display_name_format' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'sort_name_format' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
   );
 
@@ -71,11 +72,7 @@ class CRM_Admin_Form_Preferences_Display extends CRM_Admin_Form_Preferences {
           'weight' => 8,
           'html_type' => NULL,
         ),
-        'user_dashboard_options' => array(
-          'html_type' => 'checkboxes',
-          'title' => ts('Contact Dashboard'),
-          'weight' => 9,
-        ),
+
         'editor_id' => array(
           'html_type' => NULL,
           'weight' => 12,
diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 4232a42662..e21fb003a9 100644
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -105,8 +105,9 @@ return array(
     'title' => ts('Contact Dashboard'),
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => NULL,
+    'description' => ts('Select the sections that should be included in the Contact Dashboard. EXAMPLE: If you don\'t want constituents to view their own contribution history, un-check that option.'),
     'help_text' => NULL,
+    'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND,
   ),
   'address_options' => array(
     'group_name' => 'CiviCRM Preferences',
diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl
index 5ffc84caef..b4cc705618 100644
--- a/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -169,7 +169,7 @@
     <tr class="crm-preferences-display-form-block-description">
       <td>&nbsp;</td>
       <td class="description">
-        {ts}Select the sections that should be included in the Contact Dashboard. EXAMPLE: If you don't want constituents to view their own contribution history, un-check that option.{/ts}
+        {$settings_fields.user_dashboard_options.description}
       </td>
     </tr>
     <tr class="crm-preferences-display-form-block-editor_id">
-- 
2.25.1