From 58e9d36432b501ba6ff039d545186f4d138a5f30 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 15 Aug 2017 21:30:24 -0700 Subject: [PATCH] CRM-21052 - CRM_Upgrade - If site is using activity revisions, continue doing so by default. Otherwise, don't. --- CRM/Upgrade/Incremental/php/FourSeven.php | 8 ++++++++ settings/Case.setting.php | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php index 4a3606fe5b..8c92c038c0 100644 --- a/CRM/Upgrade/Incremental/php/FourSeven.php +++ b/CRM/Upgrade/Incremental/php/FourSeven.php @@ -412,6 +412,7 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base public function upgrade_4_7_25($rev) { $this->addTask("CRM-20927 - Add column to 'civicrm_menu' for additional metadata", 'addColumn', 'civicrm_menu', 'module_data', "text COMMENT 'All other menu metadata not stored in other fields'"); + $this->addTask('CRM-21052 - Determine activity revision policy', 'pickActivityRevisionPolicy'); $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); } @@ -1200,6 +1201,13 @@ FROM `civicrm_dashboard_contact` JOIN `civicrm_contact` WHERE civicrm_dashboard_ return TRUE; } + public static function pickActivityRevisionPolicy(CRM_Queue_TaskContext $ctx) { + // CRM-21052 - If site is using activity revisions, continue doing so. Otherwise, switch out. + $count = CRM_Core_DAO::singleValueQuery('SELECT count(*) FROM civicrm_activity WHERE is_current_revision = 0 OR original_id IS NOT NULL'); + Civi::settings()->set('civicaseActivityRevisions', $count > 0); + return TRUE; + } + /** * @return bool */ diff --git a/settings/Case.setting.php b/settings/Case.setting.php index 9d5288b62d..77ada71751 100644 --- a/settings/Case.setting.php +++ b/settings/Case.setting.php @@ -106,7 +106,7 @@ return array( 'name' => 'civicaseActivityRevisions', 'type' => 'Boolean', 'quick_form_type' => 'YesNo', - 'default' => TRUE, + 'default' => FALSE, 'html_type' => 'radio', 'add' => '4.7', 'title' => 'Enable Embedded Activity Revisions', -- 2.25.1