projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f018f63)
Add option group file_type
authorDominic Tubach <tubach@systopia.de>
Thu, 23 Mar 2023 12:38:39 +0000 (13:38 +0100)
committerColeman Watts <coleman@civicrm.org>
Mon, 17 Apr 2023 13:07:44 +0000 (09:07 -0400)
Update code to add option group file_type to FiveSixtyTwo

CRM/Core/DAO/File.php patch | blob | blame | history
CRM/Upgrade/Incremental/php/FiveSixtyTwo.php patch | blob | blame | history
xml/schema/Core/File.xml patch | blob | blame | history
xml/templates/civicrm_data.tpl patch | blob | blame | history

diff --git a/CRM/Core/DAO/File.php b/CRM/Core/DAO/File.php
index 91b27a3b0fa2555c02771724016cf76e603717c5..43d92ae8167db652c294b94b995973a064b24c89 100644 (file)
--- 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 440e3901adb1633ffcd327ae06077b815d42da52..cd2b513cdd3d32a08cfaee1f85e5f4017d55c204 100644 (file)
--- 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 2161fdf63b48bc172d38488e18a6ec19a23e2b0b..74a32e67920144608588108178c0518fb5b551a1 100644 (file)
--- a/xml/schema/Core/File.xml
+++ b/xml/schema/Core/File.xml
@@ -27,6 +27,12 @@
     <type>int unsigned</type>
     <title>File Type</title>
     <comment>Type of file (e.g. Transcript, Income Tax Return, etc). FK to civicrm_option_value.</comment>
+    <pseudoconstant>
+      <optionGroupName>file_type</optionGroupName>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
     <add>1.5</add>
   </field>
   <field>
diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index c250b2650dc5b075679788a6e742e9ce0fc040dd..f9c0e0c2e1a14dc60b24042f4e81900bf40537dd 100644 (file)
--- 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';