From: colemanw Date: Sat, 4 Nov 2023 00:32:21 +0000 (-0400) Subject: Schema - Add CiviMail field metadata X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=30d49c2734cf72d6b0a920e494ac165b7dcee0cb;p=civicrm-core.git Schema - Add CiviMail field metadata --- diff --git a/CRM/Mailing/DAO/Mailing.php b/CRM/Mailing/DAO/Mailing.php index 2bb67e0253..fefa921ddf 100644 --- a/CRM/Mailing/DAO/Mailing.php +++ b/CRM/Mailing/DAO/Mailing.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Mailing.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:62a218e043b9abab2e816bf69272cca1) + * (GenCodeChecksum:55608e7270f5f764477813403689775a) */ /** @@ -56,6 +56,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'copy' => 'civicrm/mailing/send?mid=[id]', 'view' => 'civicrm/mailing/report?mid=[id]&reset=1', 'preview' => 'civicrm/mailing/view?id=[id]&reset=1', + 'delete' => 'civicrm/mailing/browse?action=delete&mid=[id]&reset=1', ]; /** @@ -709,6 +710,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'localizable' => 0, 'html' => [ 'type' => 'Text', + 'label' => ts("Name"), ], 'add' => NULL, ], @@ -758,6 +760,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'localizable' => 0, 'html' => [ 'type' => 'Text', + 'label' => ts("From Name"), ], 'add' => NULL, ], @@ -781,6 +784,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'localizable' => 0, 'html' => [ 'type' => 'Text', + 'label' => ts("From Email"), ], 'add' => NULL, ], @@ -1122,6 +1126,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'html' => [ 'type' => 'Select Date', 'formatType' => 'activityDateTime', + 'label' => ts("Created Date"), ], 'add' => '3.0', ], @@ -1145,6 +1150,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'bao' => 'CRM_Mailing_BAO_Mailing', 'localizable' => 0, 'html' => [ + 'type' => 'Select Date', 'label' => ts("Modified Date"), ], 'readonly' => TRUE, @@ -1193,6 +1199,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'html' => [ 'type' => 'Select Date', 'formatType' => 'activityDateTime', + 'label' => ts("Scheduled Date"), ], 'add' => '3.3', ], @@ -1332,6 +1339,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO { 'localizable' => 0, 'html' => [ 'type' => 'Select', + 'label' => ts("Visibility"), ], 'pseudoconstant' => [ 'callback' => 'CRM_Core_SelectValues::groupVisibility', diff --git a/CRM/Mailing/DAO/MailingJob.php b/CRM/Mailing/DAO/MailingJob.php index e2dc1a5883..b4b21d1c12 100644 --- a/CRM/Mailing/DAO/MailingJob.php +++ b/CRM/Mailing/DAO/MailingJob.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/MailingJob.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:234cdededd082922f889dc386c46ed60) + * (GenCodeChecksum:92bce75ffec87400a53a47591c09201f) */ /** @@ -221,6 +221,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'localizable' => 0, 'FKClassName' => 'CRM_Mailing_DAO_Mailing', 'html' => [ + 'type' => 'EntityRef', 'label' => ts("Mailing"), ], 'add' => NULL, @@ -318,6 +319,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'localizable' => 0, 'html' => [ 'type' => 'Select', + 'label' => ts("Status"), ], 'pseudoconstant' => [ 'callback' => 'CRM_Core_SelectValues::getMailingJobStatus', @@ -342,6 +344,10 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'entity' => 'MailingJob', 'bao' => 'CRM_Mailing_BAO_MailingJob', 'localizable' => 0, + 'html' => [ + 'type' => 'CheckBox', + 'label' => ts("Test Mailing"), + ], 'add' => '1.9', ], 'job_type' => [ @@ -383,6 +389,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'localizable' => 0, 'FKClassName' => 'CRM_Mailing_DAO_MailingJob', 'html' => [ + 'type' => 'EntityRef', 'label' => ts("Parent"), ], 'add' => '3.3', @@ -423,6 +430,10 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO { 'entity' => 'MailingJob', 'bao' => 'CRM_Mailing_BAO_MailingJob', 'localizable' => 0, + 'html' => [ + 'type' => 'Number', + 'label' => ts("Batch Limit"), + ], 'add' => '3.3', ], ]; diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml index 740e64ae15..acd747466a 100644 --- a/xml/schema/Mailing/Mailing.xml +++ b/xml/schema/Mailing/Mailing.xml @@ -16,6 +16,7 @@ civicrm/mailing/send?mid=[id] civicrm/mailing/report?mid=[id]&reset=1 civicrm/mailing/view?id=[id]&reset=1 + civicrm/mailing/browse?action=delete&mid=[id]&reset=1 id @@ -152,6 +153,7 @@ 128 Mailing Name. + Text @@ -176,6 +178,7 @@ 128 From Header of mailing + Text @@ -186,6 +189,7 @@ 128 From Email of mailing + Text @@ -349,6 +353,7 @@ Date and time this mailing was created. 3.0 + Select Date activityDateTime @@ -363,6 +368,7 @@ CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP + Select Date true 4.7 @@ -391,6 +397,7 @@ Date and time this mailing was scheduled. 3.3 + Select Date activityDateTime @@ -470,6 +477,7 @@ 3.3 + Select diff --git a/xml/schema/Mailing/MailingJob.xml b/xml/schema/Mailing/MailingJob.xml index 8579589698..b28ae05cd5 100644 --- a/xml/schema/Mailing/MailingJob.xml +++ b/xml/schema/Mailing/MailingJob.xml @@ -31,6 +31,7 @@ The ID of the mailing this Job will send. + EntityRef @@ -88,6 +89,7 @@ CRM_Core_SelectValues::getMailingJobStatus + Select @@ -98,6 +100,10 @@ 0 true Is this job for a test mail? + + + CheckBox + 1.9 @@ -116,6 +122,7 @@ NULL + EntityRef 3.3 @@ -138,6 +145,10 @@ Mailing Job Limit int Queue size limit for each child job + + + Number + 0 3.3