From 4cc8e321404e3339bdc66e249581a261be478cc3 Mon Sep 17 00:00:00 2001 From: Dominic Tubach Date: Thu, 23 Mar 2023 13:38:39 +0100 Subject: [PATCH] Add option group file_type Update code to add option group file_type to FiveSixtyTwo --- CRM/Core/DAO/File.php | 9 ++++++++- CRM/Upgrade/Incremental/php/FiveSixtyTwo.php | 12 ++++++++++++ xml/schema/Core/File.xml | 6 ++++++ xml/templates/civicrm_data.tpl | 3 ++- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/CRM/Core/DAO/File.php b/CRM/Core/DAO/File.php index 91b27a3b0f..43d92ae816 100644 --- a/CRM/Core/DAO/File.php +++ b/CRM/Core/DAO/File.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/File.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:1f553579f32db40c6a3708c56d8cf58f) + * (GenCodeChecksum:b96c549a621e1c17bcfdfe8c300f6e8c) */ /** @@ -182,6 +182,13 @@ class CRM_Core_DAO_File extends CRM_Core_DAO { 'entity' => 'File', 'bao' => 'CRM_Core_BAO_File', 'localizable' => 0, + 'html' => [ + 'type' => 'Select', + ], + 'pseudoconstant' => [ + 'optionGroupName' => 'file_type', + 'optionEditPath' => 'civicrm/admin/options/file_type', + ], 'add' => '1.5', ], 'mime_type' => [ diff --git a/CRM/Upgrade/Incremental/php/FiveSixtyTwo.php b/CRM/Upgrade/Incremental/php/FiveSixtyTwo.php index 440e3901ad..cd2b513cdd 100644 --- a/CRM/Upgrade/Incremental/php/FiveSixtyTwo.php +++ b/CRM/Upgrade/Incremental/php/FiveSixtyTwo.php @@ -44,6 +44,18 @@ class CRM_Upgrade_Incremental_php_FiveSixtyTwo extends CRM_Upgrade_Incremental_B $this->addTask('Make civicrm_setting.domain_id optional', 'alterColumn', 'civicrm_setting', 'domain_id', "int unsigned DEFAULT NULL COMMENT 'Which Domain does this setting belong to'"); $this->addTask('Consolidate the list of components', 'consolidateComponents'); $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); + + $this->addTask( + 'Add option group for file_type_id in file table', + 'addOptionGroup', + [ + 'name' => 'file_type', + 'title' => ts('File Type'), + 'data_type' => 'Integer', + 'is_reserved' => 1, + ], + [] + ); } public static function consolidateComponents($ctx): bool { diff --git a/xml/schema/Core/File.xml b/xml/schema/Core/File.xml index 2161fdf63b..74a32e6792 100644 --- a/xml/schema/Core/File.xml +++ b/xml/schema/Core/File.xml @@ -27,6 +27,12 @@ int unsigned File Type Type of file (e.g. Transcript, Income Tax Return, etc). FK to civicrm_option_value. + + file_type + + + Select + 1.5 diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index c250b2650d..f9c0e0c2e1 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -214,7 +214,8 @@ VALUES ('contribution_recur_status' , '{ts escape="sql"}Recurring Contribution Status{/ts}' , NULL, 1, 1, 1, 'name,label,description', NULL), ('environment' , '{ts escape="sql"}Environment{/ts}' , NULL, 1, 1, 0, 'name,label,description', NULL), ('activity_default_assignee' , '{ts escape="sql"}Activity default assignee{/ts}' , NULL, 1, 1, 0, 'name,label,description', NULL), - ('entity_batch_extends' , '{ts escape="sql"}Entity Batch Extends{/ts}' , NULL, 1, 1, 0, 'name,label,description', NULL); + ('entity_batch_extends' , '{ts escape="sql"}Entity Batch Extends{/ts}' , NULL, 1, 1, 0, 'name,label,description', NULL), + ('file_type' , '{ts escape="sql"}File Type{/ts}' , 'Integer', 1, 1, 0, 'name,label,description', NULL); SELECT @option_group_id_pcm := max(id) from civicrm_option_group where name = 'preferred_communication_method'; SELECT @option_group_id_act := max(id) from civicrm_option_group where name = 'activity_type'; -- 2.25.1