From 8813f9724895471724b957d7d02384bee6dae758 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 4 May 2021 09:25:49 -0400 Subject: [PATCH] Set html type of campaign fields Afform needs to know that these are fields of type EntityRef. Otherwise, this metadata is currently unused. --- CRM/Activity/DAO/Activity.php | 4 ++-- CRM/Campaign/DAO/CampaignGroup.php | 3 ++- CRM/Campaign/DAO/Survey.php | 3 ++- CRM/Contribute/DAO/Contribution.php | 4 ++-- CRM/Contribute/DAO/ContributionPage.php | 3 ++- CRM/Contribute/DAO/ContributionRecur.php | 4 ++-- CRM/Event/DAO/Participant.php | 3 ++- CRM/Mailing/DAO/Mailing.php | 4 ++-- CRM/Member/DAO/Membership.php | 4 ++-- CRM/Pledge/DAO/Pledge.php | 4 ++-- xml/schema/Activity/Activity.xml | 2 +- xml/schema/Campaign/CampaignGroup.xml | 1 + xml/schema/Campaign/Survey.xml | 1 + xml/schema/Contribute/Contribution.xml | 2 +- xml/schema/Contribute/ContributionPage.xml | 1 + xml/schema/Contribute/ContributionRecur.xml | 2 +- xml/schema/Event/Participant.xml | 1 + xml/schema/Mailing/Mailing.xml | 2 +- xml/schema/Member/Membership.xml | 2 +- xml/schema/Pledge/Pledge.xml | 2 +- 20 files changed, 30 insertions(+), 22 deletions(-) diff --git a/CRM/Activity/DAO/Activity.php b/CRM/Activity/DAO/Activity.php index 0383dd657d..6dfcf94d50 100644 --- 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 42ca379a9b..28ba776655 100644 --- 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 277e1775ab..46860452a2 100644 --- 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 d0a1b66688..252d5c231b 100644 --- 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 57a34bc9cf..12bc30bb1f 100644 --- 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 707afaa176..02c0b8a995 100644 --- 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 9914258106..a6310a8d60 100644 --- 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 2e5cea00b6..c0699b539d 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: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 81e47d2a77..ca5344d7d8 100644 --- 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 9c86b0d1c9..85f1774176 100644 --- 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 5b49a49a47..0a9aef2eeb 100644 --- a/xml/schema/Activity/Activity.xml +++ b/xml/schema/Activity/Activity.xml @@ -356,7 +356,7 @@ The campaign for which this activity has been triggered. 3.4 - Select + EntityRef diff --git a/xml/schema/Campaign/CampaignGroup.xml b/xml/schema/Campaign/CampaignGroup.xml index 73a5cbc9eb..6d3880d3fd 100644 --- a/xml/schema/Campaign/CampaignGroup.xml +++ b/xml/schema/Campaign/CampaignGroup.xml @@ -29,6 +29,7 @@ true Foreign key to the activity Campaign. + EntityRef 3.3 diff --git a/xml/schema/Campaign/Survey.xml b/xml/schema/Campaign/Survey.xml index 8477dd65cc..93398c2bba 100644 --- a/xml/schema/Campaign/Survey.xml +++ b/xml/schema/Campaign/Survey.xml @@ -43,6 +43,7 @@ NULL Foreign key to the Campaign. + EntityRef 3.3 diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml index 6099ff56e7..1683b34e37 100644 --- a/xml/schema/Contribute/Contribution.xml +++ b/xml/schema/Contribute/Contribution.xml @@ -469,7 +469,7 @@ The campaign for which this contribution has been triggered. 3.4 - Select + EntityRef diff --git a/xml/schema/Contribute/ContributionPage.xml b/xml/schema/Contribute/ContributionPage.xml index 284c6adc91..92b78df29a 100644 --- a/xml/schema/Contribute/ContributionPage.xml +++ b/xml/schema/Contribute/ContributionPage.xml @@ -440,6 +440,7 @@ int unsigned The campaign for which we are collecting contributions with this page. + EntityRef 3.4 diff --git a/xml/schema/Contribute/ContributionRecur.xml b/xml/schema/Contribute/ContributionRecur.xml index 39c5fd7a36..d9ce757963 100644 --- a/xml/schema/Contribute/ContributionRecur.xml +++ b/xml/schema/Contribute/ContributionRecur.xml @@ -424,7 +424,7 @@ The campaign for which this contribution has been triggered. 4.1 - Select + EntityRef diff --git a/xml/schema/Event/Participant.xml b/xml/schema/Event/Participant.xml index 21eb08aa4c..1d07244a5e 100644 --- a/xml/schema/Event/Participant.xml +++ b/xml/schema/Event/Participant.xml @@ -266,6 +266,7 @@ true The campaign for which this participant has been registered. + EntityRef 3.4 diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml index 7682e66362..7d3c7484b0 100644 --- a/xml/schema/Mailing/Mailing.xml +++ b/xml/schema/Mailing/Mailing.xml @@ -460,7 +460,7 @@ The campaign for which this mailing has been initiated. 3.4 - Select + EntityRef diff --git a/xml/schema/Member/Membership.xml b/xml/schema/Member/Membership.xml index 50e6ac74ee..8e9b713d1a 100644 --- a/xml/schema/Member/Membership.xml +++ b/xml/schema/Member/Membership.xml @@ -283,7 +283,7 @@ The campaign for which this membership is attached. 3.4 - Select + EntityRef diff --git a/xml/schema/Pledge/Pledge.xml b/xml/schema/Pledge/Pledge.xml index 0fc7c6491d..f7205ed5bf 100644 --- a/xml/schema/Pledge/Pledge.xml +++ b/xml/schema/Pledge/Pledge.xml @@ -336,7 +336,7 @@ The campaign for which this pledge has been initiated. 3.4 - Select + EntityRef -- 2.25.1