Schema - Add CiviMail field metadata

diff --git a/CRM/Mailing/DAO/Mailing.php b/CRM/Mailing/DAO/Mailing.php
index 2bb67e0253ba964c540482738d44a07d1283a60d..fefa921ddfc12bcc27fc7d004b2cb32ecfe8c28f 100644 (file)
--- 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 e2dc1a5883a2ec3bf22c7cbb979bf273f1d7531e..b4b21d1c12c46539f26e96c2a4130f02db91b7b3 100644 (file)
--- 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 740e64ae15577f2b45fc456117eec8141307b5f7..acd747466a252b49ddbf25080feedebd12c1d92b 100644 (file)
--- a/xml/schema/Mailing/Mailing.xml
+++ b/xml/schema/Mailing/Mailing.xml
@@ -16,6 +16,7 @@
     <copy>civicrm/mailing/send?mid=[id]</copy>
     <view>civicrm/mailing/report?mid=[id]&amp;reset=1</view>
     <preview>civicrm/mailing/view?id=[id]&amp;reset=1</preview>
+    <delete>civicrm/mailing/browse?action=delete&amp;mid=[id]&amp;reset=1</delete>
   </paths>
   <field>
     <name>id</name>
@@ -152,6 +153,7 @@
     <length>128</length>
     <comment>Mailing Name.</comment>
     <html>
+      <label>Name</label>
       <type>Text</type>
     </html>
   </field>
@@ -176,6 +178,7 @@
     <length>128</length>
     <comment>From Header of mailing</comment>
     <html>
+      <label>From Name</label>
       <type>Text</type>
     </html>
   </field>
@@ -186,6 +189,7 @@
     <length>128</length>
     <comment>From Email of mailing</comment>
     <html>
+      <label>From Email</label>
       <type>Text</type>
     </html>
   </field>
@@ -349,6 +353,7 @@
     <comment>Date and time this mailing was created.</comment>
     <add>3.0</add>
     <html>
+      <label>Created Date</label>
       <type>Select Date</type>
       <formatType>activityDateTime</formatType>
     </html>
@@ -363,6 +368,7 @@
    <default>CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP</default>
     <html>
       <label>Modified Date</label>
+      <type>Select Date</type>
     </html>
     <readonly>true</readonly>
    <add>4.7</add>
@@ -391,6 +397,7 @@
     <comment>Date and time this mailing was scheduled.</comment>
     <add>3.3</add>
     <html>
+      <label>Scheduled Date</label>
       <type>Select Date</type>
       <formatType>activityDateTime</formatType>
     </html>
@@ -470,6 +477,7 @@
     </pseudoconstant>
     <add>3.3</add>
     <html>
+      <label>Visibility</label>
       <type>Select</type>
     </html>
   </field>

diff --git a/xml/schema/Mailing/MailingJob.xml b/xml/schema/Mailing/MailingJob.xml
index 857958969841b28413406c78dd29ce11d2963c16..b28ae05cd59c1c91aaffc4efc9758cee120d04e3 100644 (file)
--- a/xml/schema/Mailing/MailingJob.xml
+++ b/xml/schema/Mailing/MailingJob.xml
@@ -31,6 +31,7 @@
     <comment>The ID of the mailing this Job will send.</comment>
     <html>
       <label>Mailing</label>
+      <type>EntityRef</type>
     </html>
   </field>
   <foreignKey>
@@ -88,6 +89,7 @@
       <callback>CRM_Core_SelectValues::getMailingJobStatus</callback>
     </pseudoconstant>
     <html>
+      <label>Status</label>
       <type>Select</type>
     </html>
   </field>
@@ -98,6 +100,10 @@
     <default>0</default>
     <required>true</required>
     <comment>Is this job for a test mail?</comment>
+    <html>
+      <label>Test Mailing</label>
+      <type>CheckBox</type>
+    </html>
     <add>1.9</add>
   </field>
   <field>
@@ -116,6 +122,7 @@
     <default>NULL</default>
     <html>
       <label>Parent</label>
+      <type>EntityRef</type>
     </html>
     <add>3.3</add>
   </field>
@@ -138,6 +145,10 @@
     <title>Mailing Job Limit</title>
     <type>int</type>
     <comment>Queue size limit for each child job</comment>
+    <html>
+      <label>Batch Limit</label>
+      <type>Number</type>
+    </html>
     <default>0</default>
     <add>3.3</add>
   </field>