From 1675d7d66f1ff2c6017d716386220054ec58bca6 Mon Sep 17 00:00:00 2001 From: demeritcowboy Date: Fri, 12 Aug 2022 13:02:57 -0400 Subject: [PATCH] fix incorrectly changed default --- CRM/Contact/DAO/DashboardContact.php | 7 +++---- CRM/Upgrade/Incremental/php/FiveFiftyThree.php | 4 ++++ CRM/Upgrade/Incremental/sql/5.53.beta1.mysql.tpl | 3 +++ xml/schema/Contact/DashboardContact.xml | 3 +-- 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 CRM/Upgrade/Incremental/sql/5.53.beta1.mysql.tpl diff --git a/CRM/Contact/DAO/DashboardContact.php b/CRM/Contact/DAO/DashboardContact.php index fe7aeebb20..b8881db880 100644 --- a/CRM/Contact/DAO/DashboardContact.php +++ b/CRM/Contact/DAO/DashboardContact.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contact/DashboardContact.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:ca2325df4ca179436e4901bbed693e20) + * (GenCodeChecksum:fd3f7ea02b93c0dd3ecd46fb757bc2a3) */ /** @@ -67,7 +67,7 @@ class CRM_Contact_DAO_DashboardContact extends CRM_Core_DAO { /** * Is this widget active? * - * @var bool|string + * @var bool|string|null * (SQL type: tinyint) * Note that values will be retrieved from the database as a string. */ @@ -195,9 +195,8 @@ class CRM_Contact_DAO_DashboardContact extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Dashlet is Active?'), 'description' => ts('Is this widget active?'), - 'required' => TRUE, 'where' => 'civicrm_dashboard_contact.is_active', - 'default' => '1', + 'default' => '0', 'table_name' => 'civicrm_dashboard_contact', 'entity' => 'DashboardContact', 'bao' => 'CRM_Contact_BAO_DashboardContact', diff --git a/CRM/Upgrade/Incremental/php/FiveFiftyThree.php b/CRM/Upgrade/Incremental/php/FiveFiftyThree.php index 91460a0b45..c647da3cd2 100644 --- a/CRM/Upgrade/Incremental/php/FiveFiftyThree.php +++ b/CRM/Upgrade/Incremental/php/FiveFiftyThree.php @@ -61,6 +61,10 @@ class CRM_Upgrade_Incremental_php_FiveFiftyThree extends CRM_Upgrade_Incremental $this->addTask('Add Recent Items Providers', 'addRecentItemsProviders'); } + public function upgrade_5_53_beta1($rev): void { + $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); + } + /** * @param CRM_Queue_TaskContext $ctx * @return bool diff --git a/CRM/Upgrade/Incremental/sql/5.53.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.53.beta1.mysql.tpl new file mode 100644 index 0000000000..7063c436b5 --- /dev/null +++ b/CRM/Upgrade/Incremental/sql/5.53.beta1.mysql.tpl @@ -0,0 +1,3 @@ +{* file to handle db changes in 5.53.beta1 during upgrade *} + +ALTER TABLE `civicrm_dashboard_contact` MODIFY COLUMN `is_active` TINYINT(4) DEFAULT 0 COMMENT 'Is this widget active?'; diff --git a/xml/schema/Contact/DashboardContact.xml b/xml/schema/Contact/DashboardContact.xml index eda7bb078f..86d4761772 100644 --- a/xml/schema/Contact/DashboardContact.xml +++ b/xml/schema/Contact/DashboardContact.xml @@ -98,8 +98,7 @@ boolean Dashlet is Active? Is this widget active? - 1 - true + 0 3.1 -- 2.25.1