Merge pull request #20191 from colemanw/apiSettingsFixes

APIv4 - Setting api misc fixes & tests

diff --git a/CRM/Activity/DAO/Activity.php b/CRM/Activity/DAO/Activity.php
index 0383dd657d6802b8041fc27a16e35a56bb887211..6dfcf94d50c961d19826a3027acfe5b2a75c47f4 100644 (file)
--- a/CRM/Activity/DAO/Activity.php
+++ b/CRM/Activity/DAO/Activity.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Activity/Activity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:97cc493950f4cc2a6d8858e77f144d8f)
+ * (GenCodeChecksum:1ccd103b675d229c35dcbae40203f75d)
  */
 
 /**
@@ -673,7 +673,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Campaign_DAO_Campaign',
           'html' => [
-            'type' => 'Select',
+            'type' => 'EntityRef',
             'label' => ts("Campaign"),
           ],
           'add' => '3.4',

diff --git a/CRM/Campaign/DAO/CampaignGroup.php b/CRM/Campaign/DAO/CampaignGroup.php
index 42ca379a9b39ecada8715ba7c75a32618e25d6cc..28ba776655d3d157649dfcd1357196899cc27169 100644 (file)
--- a/CRM/Campaign/DAO/CampaignGroup.php
+++ b/CRM/Campaign/DAO/CampaignGroup.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Campaign/CampaignGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1cf5b0513e86c29cb81bd0f694ccafcd)
+ * (GenCodeChecksum:7bfca99dbb564a33bc7845002f091536)
  */
 
 /**
@@ -138,6 +138,7 @@ class CRM_Campaign_DAO_CampaignGroup extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Campaign_DAO_Campaign',
           'html' => [
+            'type' => 'EntityRef',
             'label' => ts("Campaign"),
           ],
           'add' => '3.3',

diff --git a/CRM/Campaign/DAO/Survey.php b/CRM/Campaign/DAO/Survey.php
index 277e1775abf76e26f89859f7f49a7a247c57c2ed..46860452a2de5f02289aa74e518a815f83f696a0 100644 (file)
--- a/CRM/Campaign/DAO/Survey.php
+++ b/CRM/Campaign/DAO/Survey.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Campaign/Survey.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1c74399d67561c75f39d8db59b04737d)
+ * (GenCodeChecksum:3bdc2fa5133ad1ff24f2bdefccceccfc)
  */
 
 /**
@@ -275,6 +275,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Campaign_DAO_Campaign',
           'html' => [
+            'type' => 'EntityRef',
             'label' => ts("Campaign"),
           ],
           'add' => '3.3',

diff --git a/CRM/Contribute/DAO/Contribution.php b/CRM/Contribute/DAO/Contribution.php
index d0a1b666884616e92d6a473f720ad83dbf8fd209..252d5c231bce7f0b961142b9af1fa13ba8391aed 100644 (file)
--- a/CRM/Contribute/DAO/Contribution.php
+++ b/CRM/Contribute/DAO/Contribution.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Contribution.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6eb465457269fac04fdc1fb6e35f2161)
+ * (GenCodeChecksum:12ecb43dae98d73b95dc505a817a4971)
  */
 
 /**
@@ -858,7 +858,7 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Campaign_DAO_Campaign',
           'html' => [
-            'type' => 'Select',
+            'type' => 'EntityRef',
             'label' => ts("Campaign"),
           ],
           'add' => '3.4',

diff --git a/CRM/Contribute/DAO/ContributionPage.php b/CRM/Contribute/DAO/ContributionPage.php
index 57a34bc9cf365d8260e642c6a5c02e06f44efd48..12bc30bb1f7030f1b1b83ebe362f5ac2c5371734 100644 (file)
--- a/CRM/Contribute/DAO/ContributionPage.php
+++ b/CRM/Contribute/DAO/ContributionPage.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionPage.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:311103358834b23440ba20d8354c2438)
+ * (GenCodeChecksum:2f819db4ba476398cb4f52fc2f42a6d3)
  */
 
 /**
@@ -1055,6 +1055,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Campaign_DAO_Campaign',
           'html' => [
+            'type' => 'EntityRef',
             'label' => ts("Campaign"),
           ],
           'add' => '3.4',

diff --git a/CRM/Contribute/DAO/ContributionRecur.php b/CRM/Contribute/DAO/ContributionRecur.php
index 707afaa1769ca3e5802895dfc601db0984e5425e..02c0b8a9950f517d6a34765c4fe58617a9a7cfdc 100644 (file)
--- a/CRM/Contribute/DAO/ContributionRecur.php
+++ b/CRM/Contribute/DAO/ContributionRecur.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionRecur.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:47f389ccf532868b1a41d77c7691912a)
+ * (GenCodeChecksum:e58956eaa5a91dcce78d10bd58a45d0f)
  */
 
 /**
@@ -784,7 +784,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Campaign_DAO_Campaign',
           'html' => [
-            'type' => 'Select',
+            'type' => 'EntityRef',
             'label' => ts("Campaign"),
           ],
           'add' => '4.1',

diff --git a/CRM/Event/DAO/Participant.php b/CRM/Event/DAO/Participant.php
index 991425810675326dba4a6498a044824866748cd6..a6310a8d60a6cd5bfb16b6a5da4992456f1d45f6 100644 (file)
--- a/CRM/Event/DAO/Participant.php
+++ b/CRM/Event/DAO/Participant.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Participant.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c9cc760db122ae2f826c169efed061f2)
+ * (GenCodeChecksum:ead583cdd16d48911d96d376079bee27)
  */
 
 /**
@@ -513,6 +513,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Campaign_DAO_Campaign',
           'html' => [
+            'type' => 'EntityRef',
             'label' => ts("Campaign"),
           ],
           'add' => '3.4',

diff --git a/CRM/Mailing/DAO/Mailing.php b/CRM/Mailing/DAO/Mailing.php
index 2e5cea00b6aea6a5ef4e21c89b52f1680d03b532..c0699b539d5a87dfd75b945a3d1492b5bfcf6e9e 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:7ed223a1ad1e201eeaec36b65e4313e4)
+ * (GenCodeChecksum:bc5d96fc76dc310a6c1ecc81b59d0e05)
  */
 
 /**
@@ -1016,7 +1016,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Campaign_DAO_Campaign',
           'html' => [
-            'type' => 'Select',
+            'type' => 'EntityRef',
             'label' => ts("Campaign"),
           ],
           'add' => '3.4',

diff --git a/CRM/Member/DAO/Membership.php b/CRM/Member/DAO/Membership.php
index 81e47d2a77e2fa11dda1a0e4c2ad3f16e806bc79..ca5344d7d87427d15942c375a9fdef28f17577f3 100644 (file)
--- a/CRM/Member/DAO/Membership.php
+++ b/CRM/Member/DAO/Membership.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/Membership.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:689a972f40e7180422d4ca73600a7577)
+ * (GenCodeChecksum:c60e586b6aed4d58fa869589f58d22f1)
  */
 
 /**
@@ -513,7 +513,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Campaign_DAO_Campaign',
           'html' => [
-            'type' => 'Select',
+            'type' => 'EntityRef',
             'label' => ts("Campaign"),
           ],
           'add' => '3.4',

diff --git a/CRM/Pledge/DAO/Pledge.php b/CRM/Pledge/DAO/Pledge.php
index 9c86b0d1c958a81fc60650cbd788e9d76da3f5ff..85f1774176c21085c90c8cea696af08eae18ea89 100644 (file)
--- a/CRM/Pledge/DAO/Pledge.php
+++ b/CRM/Pledge/DAO/Pledge.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Pledge/Pledge.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:dbae8b55f038778bd6862b001237a828)
+ * (GenCodeChecksum:57ee5021890cbba432afe9e252088f74)
  */
 
 /**
@@ -665,7 +665,7 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Campaign_DAO_Campaign',
           'html' => [
-            'type' => 'Select',
+            'type' => 'EntityRef',
             'label' => ts("Campaign"),
           ],
           'add' => '3.4',

diff --git a/xml/schema/Activity/Activity.xml b/xml/schema/Activity/Activity.xml
index 5b49a49a478be5f32a31986c21c21cc5c992d979..0a9aef2eebb484f9959967d701e6d5465a2834f8 100644 (file)
--- a/xml/schema/Activity/Activity.xml
+++ b/xml/schema/Activity/Activity.xml
@@ -356,7 +356,7 @@
     <comment>The campaign for which this activity has been triggered.</comment>
     <add>3.4</add>
     <html>
-      <type>Select</type>
+      <type>EntityRef</type>
       <label>Campaign</label>
     </html>
   </field>

diff --git a/xml/schema/Campaign/CampaignGroup.xml b/xml/schema/Campaign/CampaignGroup.xml
index 73a5cbc9eb6281216d7bf36d8a1e4ffaa5884039..6d3880d3fd46bbcc01f64375c99f7db14a321faf 100644 (file)
--- a/xml/schema/Campaign/CampaignGroup.xml
+++ b/xml/schema/Campaign/CampaignGroup.xml
@@ -29,6 +29,7 @@
     <required>true</required>
     <comment>Foreign key to the activity Campaign.</comment>
     <html>
+      <type>EntityRef</type>
       <label>Campaign</label>
     </html>
     <add>3.3</add>

diff --git a/xml/schema/Campaign/Survey.xml b/xml/schema/Campaign/Survey.xml
index 8477dd65cceb4da2f480f2d1c92852491dde547d..93398c2bbaae775da71d0e30144f544fce7b777b 100644 (file)
--- a/xml/schema/Campaign/Survey.xml
+++ b/xml/schema/Campaign/Survey.xml
@@ -43,6 +43,7 @@
     <default>NULL</default>
     <comment>Foreign key to the Campaign.</comment>
     <html>
+      <type>EntityRef</type>
       <label>Campaign</label>
     </html>
     <add>3.3</add>

diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml
index 6099ff56e7ad6319b056df4c6f78037a251c3c98..1683b34e3726bb613609e9e05490f2479d174015 100644 (file)
--- a/xml/schema/Contribute/Contribution.xml
+++ b/xml/schema/Contribute/Contribution.xml
@@ -469,7 +469,7 @@
     <comment>The campaign for which this contribution has been triggered.</comment>
     <add>3.4</add>
     <html>
-      <type>Select</type>
+      <type>EntityRef</type>
       <label>Campaign</label>
     </html>
   </field>

diff --git a/xml/schema/Contribute/ContributionPage.xml b/xml/schema/Contribute/ContributionPage.xml
index 284c6adc91177dee1a3393c3b3a87f04929b109f..92b78df29a2d85bb753d099e6eb4399fe216c5e6 100644 (file)
--- a/xml/schema/Contribute/ContributionPage.xml
+++ b/xml/schema/Contribute/ContributionPage.xml
@@ -440,6 +440,7 @@
     <type>int unsigned</type>
     <comment>The campaign for which we are collecting contributions with this page.</comment>
     <html>
+      <type>EntityRef</type>
       <label>Campaign</label>
     </html>
     <add>3.4</add>

diff --git a/xml/schema/Contribute/ContributionRecur.xml b/xml/schema/Contribute/ContributionRecur.xml
index 39c5fd7a366d2c6aa5c02343386af163fbb47f47..d9ce7579632ba89ec900a9cb0856aeb7448728b4 100644 (file)
--- a/xml/schema/Contribute/ContributionRecur.xml
+++ b/xml/schema/Contribute/ContributionRecur.xml
@@ -424,7 +424,7 @@
     <comment>The campaign for which this contribution has been triggered.</comment>
     <add>4.1</add>
     <html>
-      <type>Select</type>
+      <type>EntityRef</type>
       <label>Campaign</label>
     </html>
   </field>

diff --git a/xml/schema/Event/Participant.xml b/xml/schema/Event/Participant.xml
index 21eb08aa4c1be8b22278795b65bbc36e4a2733d6..1d07244a5e6bf7b850b7b340c08d12f0636fadb7 100644 (file)
--- a/xml/schema/Event/Participant.xml
+++ b/xml/schema/Event/Participant.xml
@@ -266,6 +266,7 @@
     <import>true</import>
     <comment>The campaign for which this participant has been registered.</comment>
     <html>
+      <type>EntityRef</type>
       <label>Campaign</label>
     </html>
     <add>3.4</add>

diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml
index 7682e66362820dab12d50265136ea8404ef10bb7..7d3c7484b067dd3c4cf77b6631248125aa1ed4b9 100644 (file)
--- a/xml/schema/Mailing/Mailing.xml
+++ b/xml/schema/Mailing/Mailing.xml
@@ -460,7 +460,7 @@
     <comment>The campaign for which this mailing has been initiated.</comment>
     <add>3.4</add>
     <html>
-      <type>Select</type>
+      <type>EntityRef</type>
       <label>Campaign</label>
     </html>
   </field>

diff --git a/xml/schema/Member/Membership.xml b/xml/schema/Member/Membership.xml
index 50e6ac74ee6e26fa299a73607938f61b48a51548..8e9b713d1a4c0c1a5408cb3fa667961dfdbaa666 100644 (file)
--- a/xml/schema/Member/Membership.xml
+++ b/xml/schema/Member/Membership.xml
@@ -283,7 +283,7 @@
     <comment>The campaign for which this membership is attached.</comment>
     <add>3.4</add>
     <html>
-      <type>Select</type>
+      <type>EntityRef</type>
       <label>Campaign</label>
     </html>
   </field>

diff --git a/xml/schema/Pledge/Pledge.xml b/xml/schema/Pledge/Pledge.xml
index 0fc7c6491d6cef3f5ee6746ecffb2e9a61870723..f7205ed5bffa62be2c3d3fc4a2b20e2176359e84 100644 (file)
--- a/xml/schema/Pledge/Pledge.xml
+++ b/xml/schema/Pledge/Pledge.xml
@@ -336,7 +336,7 @@
     <comment>The campaign for which this pledge has been initiated.</comment>
     <add>3.4</add>
     <html>
-      <type>Select</type>
+      <type>EntityRef</type>
       <label>Campaign</label>
     </html>
   </field>