projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56f2fdf 7ec15a3)
Merge pull request #2252 from civicrm/4.4
authorcolemanw <coleman@civicrm.org>
Sun, 29 Dec 2013 04:33:38 +0000 (20:33 -0800)
committercolemanw <coleman@civicrm.org>
Sun, 29 Dec 2013 04:33:38 +0000 (20:33 -0800)
Merge branch 4.4 into master

12 files changed:
1  2 
CRM/Case/BAO/Case.php patch | diff1 | diff2 | blob | history
xml/schema/Activity/Activity.xml patch | diff1 | diff2 | blob | history
xml/schema/Campaign/CampaignGroup.xml patch | diff1 | diff2 | blob | history
xml/schema/Campaign/Survey.xml patch | diff1 | diff2 | blob | history
xml/schema/Contribute/Contribution.xml patch | diff1 | diff2 | blob | history
xml/schema/Contribute/ContributionPage.xml patch | diff1 | diff2 | blob | history
xml/schema/Contribute/ContributionRecur.xml patch | diff1 | diff2 | blob | history
xml/schema/Event/Event.xml patch | diff1 | diff2 | blob | history
xml/schema/Event/Participant.xml patch | diff1 | diff2 | blob | history
xml/schema/Mailing/Mailing.xml patch | diff1 | diff2 | blob | history
xml/schema/Member/Membership.xml patch | diff1 | diff2 | blob | history
xml/schema/Pledge/Pledge.xml patch | diff1 | diff2 | blob | history

diff --cc CRM/Case/BAO/Case.php
Simple merge
diff --cc xml/schema/Activity/Activity.xml
index b120584f8df3e0ff4a99f78bd03b8d2e034806ad,6757e7609723ac718add2d531bde90ce68ecc0ff..ab8f34e864b52b230cd8711c94a75b78cde05223
--- 1/xml/schema/Activity/Activity.xml
--- 2/xml/schema/Activity/Activity.xml
+++ b/xml/schema/Activity/Activity.xml
@@@ -418,10 -372,13 +418,16 @@@
         <title>Campaign ID</title>
         <import>true</import>
         <comment>The campaign for which this activity has been triggered.</comment>
+        <pseudoconstant>
+           <table>civicrm_campaign</table>
+           <keyColumn>id</keyColumn>
+           <labelColumn>title</labelColumn>
+           <condition>(end_date IS NULL OR end_date > NOW())</condition>
+        </pseudoconstant>
         <add>3.4</add>
 +       <html>
 +         <type>CheckBox</type>
 +       </html>
    </field>
    <foreignKey>
         <name>campaign_id</name>
diff --cc xml/schema/Campaign/CampaignGroup.xml
Simple merge
diff --cc xml/schema/Campaign/Survey.xml
Simple merge
diff --cc xml/schema/Contribute/Contribution.xml
index d9a6d539e5ab73cf7e554ca7afe525c557ea331e,e85f2fe88d94da948d59b4f6f93021462391152d..debdb57d852da92fbc22b172fe594bf8d5d15e1e
--- 1/xml/schema/Contribute/Contribution.xml
--- 2/xml/schema/Contribute/Contribution.xml
+++ b/xml/schema/Contribute/Contribution.xml
@@@ -469,10 -400,13 +469,16 @@@
      <title>Campaign ID</title>
      <import>true</import>
      <comment>The campaign for which this contribution has been triggered.</comment>
+     <pseudoconstant>
+       <table>civicrm_campaign</table>
+       <keyColumn>id</keyColumn>
+       <labelColumn>title</labelColumn>
+       <condition>(end_date IS NULL OR end_date > NOW())</condition>
+     </pseudoconstant>
      <add>3.4</add>
 +    <html>
 +      <type>Select</type>
 +    </html>
    </field>
    <foreignKey>
      <name>campaign_id</name>
diff --cc xml/schema/Event/Event.xml
index 66a1ebcfe7e10c1bf6c623cd586b76f430b28457,664b4a2aebb79ca1ebb3f01200bc14cde38c1a89..551af2a010752b73e9fb0c88ae885f43405b613a
--- 1/xml/schema/Event/Event.xml
--- 2/xml/schema/Event/Event.xml
+++ b/xml/schema/Event/Event.xml
@@@ -742,10 -593,13 +742,16 @@@
      <type>int unsigned</type>
      <title>Campaign ID</title>
      <comment>The campaign for which this event has been created.</comment>
+     <pseudoconstant>
+       <table>civicrm_campaign</table>
+       <keyColumn>id</keyColumn>
+       <labelColumn>title</labelColumn>
+       <condition>(end_date IS NULL OR end_date > NOW())</condition>
+     </pseudoconstant>
      <add>3.4</add>
 +    <html>
 +       <type>Autocomplete-Select</type>
 +     </html>
    </field>
    <foreignKey>
      <name>campaign_id</name>
diff --cc xml/schema/Event/Participant.xml
Simple merge
diff --cc xml/schema/Mailing/Mailing.xml
index 9d6a0a0154ebecdcfa867259438d1193dd347d35,47e90d2226099d54df472ae63b707d13f90ce42c..95c1e62d264d883ace806cecaf210b3216007c59
--- 1/xml/schema/Mailing/Mailing.xml
--- 2/xml/schema/Mailing/Mailing.xml
+++ b/xml/schema/Mailing/Mailing.xml
@@@ -311,10 -266,13 +311,16 @@@
         <name>campaign_id</name>
         <type>int unsigned</type>
         <comment>The campaign for which this mailing has been initiated.</comment>
+        <pseudoconstant>
+           <table>civicrm_campaign</table>
+           <keyColumn>id</keyColumn>
+           <labelColumn>title</labelColumn>
+           <condition>(end_date IS NULL OR end_date > NOW())</condition>
+        </pseudoconstant>
         <add>3.4</add>
 +       <html>
 +          <type>Select</type>
 +        </html>
    </field>
    <foreignKey>
         <name>campaign_id</name>
diff --cc xml/schema/Member/Membership.xml
index 663935d1f790e69f15d9638591bd593088c054c2,37cc73000bd05b56a03099c20b990650d0761117..0b08320cb79134c1cbecd03254502cea2d2bdb59
--- 1/xml/schema/Member/Membership.xml
--- 2/xml/schema/Member/Membership.xml
+++ b/xml/schema/Member/Membership.xml
@@@ -237,10 -204,13 +237,16 @@@
      <title>Campaign ID</title>
      <import>true</import>
      <comment>The campaign for which this membership is attached.</comment>
+     <pseudoconstant>
+       <table>civicrm_campaign</table>
+       <keyColumn>id</keyColumn>
+       <labelColumn>title</labelColumn>
+       <condition>(end_date IS NULL OR end_date > NOW())</condition>
+     </pseudoconstant>
      <add>3.4</add>
 +    <html>
 +      <type>Select</type>
 +    </html>
    </field>
    <foreignKey>
      <name>campaign_id</name>
diff --cc xml/schema/Pledge/Pledge.xml
index 2f2c42cfd5bb7d8aaf37e851436065b204cc6404,4ca0f3e8554f469e58e4d10af0c44031d6dfdee4..d91eb202df4f22530b9d8c441bd51ecae3000ac0
--- 1/xml/schema/Pledge/Pledge.xml
--- 2/xml/schema/Pledge/Pledge.xml
+++ b/xml/schema/Pledge/Pledge.xml
@@@ -337,10 -277,13 +337,16 @@@
      <title>Campaign ID</title>
      <import>true</import>
      <comment>The campaign for which this pledge has been initiated.</comment>
+     <pseudoconstant>
+       <table>civicrm_campaign</table>
+       <keyColumn>id</keyColumn>
+       <labelColumn>title</labelColumn>
+       <condition>(end_date IS NULL OR end_date > NOW())</condition>
+     </pseudoconstant>
      <add>3.4</add>
 +    <html>
 +      <type>Select</type>
 +    </html>
    </field>
    <foreignKey>
      <name>campaign_id</name>