CRM-13810 - Campaign Search - remove data constraint, rename Campaign ID to Campaign...

diff --git a/CRM/Contact/Form/Search/Builder.php b/CRM/Contact/Form/Search/Builder.php
index bb639f6125da28ec565d79ad92730f3cc0ee9d81..f34bb155ae8c2d62d3c3a4396399ea11427eaab8 100644 (file)
--- a/CRM/Contact/Form/Search/Builder.php
+++ b/CRM/Contact/Form/Search/Builder.php
@@ -393,12 +393,15 @@ class CRM_Contact_Form_Search_Builder extends CRM_Contact_Form_Search {
   }
 
   static function fields() {
-    return array_merge(
+    $fields = array_merge(
       CRM_Contact_BAO_Contact::exportableFields('All', FALSE, TRUE),
       CRM_Core_Component::getQueryFields(),
       CRM_Contact_BAO_Query_Hook::singleton()->getFields(),
       CRM_Activity_BAO_Activity::exportableFields()
     );
+    // CRM-13810 Remove 'Campaign Title' pseudofield
+    CRM_Utils_Array::remove($fields, 'activity_campaign', 'participant_campaign', 'member_campaign', 'pledge_campaign');
+    return $fields;
   }
 
   /**

diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index bb9560614305e91f197b1e131b37b363141e6bd0..1a2630d3beebe313b587a8a3e9104c4d1ed4684f 100644 (file)
--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -303,8 +303,7 @@ class CRM_Core_PseudoConstant {
       $pseudoconstant = $fieldSpec['pseudoconstant'];
       // Merge params with schema defaults
       $params += array(
-        // Skip default condition in validate context
-        'condition' => $context == 'validate' ? array() : CRM_Utils_Array::value('condition', $pseudoconstant, array()),
+        'condition' => CRM_Utils_Array::value('condition', $pseudoconstant, array()),
         'keyColumn' => CRM_Utils_Array::value('keyColumn', $pseudoconstant),
         'labelColumn' => CRM_Utils_Array::value('labelColumn', $pseudoconstant),
       );

diff --git a/xml/schema/Activity/Activity.xml b/xml/schema/Activity/Activity.xml
index 6757e7609723ac718add2d531bde90ce68ecc0ff..8aec77bebd49616647dde2950680340c22a0e866 100644 (file)
--- a/xml/schema/Activity/Activity.xml
+++ b/xml/schema/Activity/Activity.xml
@@ -369,14 +369,13 @@
        <name>campaign_id</name>
        <uniqueName>activity_campaign_id</uniqueName>
        <type>int unsigned</type>
-       <title>Campaign ID</title>
+       <title>Campaign</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>
   </field>

diff --git a/xml/schema/Campaign/CampaignGroup.xml b/xml/schema/Campaign/CampaignGroup.xml
index 29e97c76ec5cbab979f0b94619dcd80d4910ff8a..2432ee00252db00bab9bab421a01ff78508bf4d3 100644 (file)
--- a/xml/schema/Campaign/CampaignGroup.xml
+++ b/xml/schema/Campaign/CampaignGroup.xml
@@ -27,7 +27,6 @@
       <table>civicrm_campaign</table>
       <keyColumn>id</keyColumn>
       <labelColumn>title</labelColumn>
-      <condition>(end_date IS NULL OR end_date > NOW())</condition>
     </pseudoconstant>
     <add>3.3</add>
   </field>

diff --git a/xml/schema/Campaign/Survey.xml b/xml/schema/Campaign/Survey.xml
index 0f8d394f9cbf5f487a7a3e0101c1445c64057e9c..cca12a42aaf4f10bfb9deb6fbf4548b44da6436b 100644 (file)
--- a/xml/schema/Campaign/Survey.xml
+++ b/xml/schema/Campaign/Survey.xml
@@ -38,7 +38,6 @@
       <table>civicrm_campaign</table>
       <keyColumn>id</keyColumn>
       <labelColumn>title</labelColumn>
-      <condition>(end_date IS NULL OR end_date > NOW())</condition>
     </pseudoconstant>
     <add>3.3</add>
   </field>

diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml
index e85f2fe88d94da948d59b4f6f93021462391152d..bd3c6c62bcda96f483a16bbe5a73c9363df2a549 100644 (file)
--- a/xml/schema/Contribute/Contribution.xml
+++ b/xml/schema/Contribute/Contribution.xml
@@ -397,14 +397,13 @@
     <name>campaign_id</name>
     <uniqueName>contribution_campaign_id</uniqueName>
     <type>int unsigned</type>
-    <title>Campaign ID</title>
+    <title>Campaign</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>
   </field>

diff --git a/xml/schema/Contribute/ContributionPage.xml b/xml/schema/Contribute/ContributionPage.xml
index 219847582374b712879a7db489ed5f80fe7ee000..62673788a0f596be524b725a8ba0c81151319825 100644 (file)
--- a/xml/schema/Contribute/ContributionPage.xml
+++ b/xml/schema/Contribute/ContributionPage.xml
@@ -415,7 +415,6 @@
       <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>
   </field>

diff --git a/xml/schema/Contribute/ContributionRecur.xml b/xml/schema/Contribute/ContributionRecur.xml
index 61ff6c490a81a074143789b0c48e80a57097bcf4..8f11faaf38a800a5f7ae188bef88f7b17c4329f8 100644 (file)
--- a/xml/schema/Contribute/ContributionRecur.xml
+++ b/xml/schema/Contribute/ContributionRecur.xml
@@ -292,14 +292,13 @@
     <name>campaign_id</name>
     <uniqueName>contribution_campaign_id</uniqueName>
     <type>int unsigned</type>
-    <title>Campaign ID</title>
+    <title>Campaign</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>4.1</add>
   </field>

diff --git a/xml/schema/Event/Event.xml b/xml/schema/Event/Event.xml
index 664b4a2aebb79ca1ebb3f01200bc14cde38c1a89..ec438663765d15e7a1ee40493892b153689b00f3 100644 (file)
--- a/xml/schema/Event/Event.xml
+++ b/xml/schema/Event/Event.xml
@@ -591,13 +591,12 @@
   <field>
     <name>campaign_id</name>
     <type>int unsigned</type>
-    <title>Campaign ID</title>
+    <title>Campaign</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>
   </field>

diff --git a/xml/schema/Event/Participant.xml b/xml/schema/Event/Participant.xml
index c49d796b8335dc50d233810593144c04907c28ff..2561261f3604a0486f82eebec81701a322752f18 100644 (file)
--- a/xml/schema/Event/Participant.xml
+++ b/xml/schema/Event/Participant.xml
@@ -223,14 +223,13 @@
       <name>campaign_id</name>
       <uniqueName>participant_campaign_id</uniqueName>
       <type>int unsigned</type>
-      <title>Campaign ID</title>
+      <title>Campaign</title>
       <import>true</import>
       <comment>The campaign for which this participant has been registered.</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>
   </field>

diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml
index 47e90d2226099d54df472ae63b707d13f90ce42c..27ef77cf92cad09ddb2b25941a6c9fc813d49178 100644 (file)
--- a/xml/schema/Mailing/Mailing.xml
+++ b/xml/schema/Mailing/Mailing.xml
@@ -270,7 +270,6 @@
           <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>
   </field>

diff --git a/xml/schema/Member/Membership.xml b/xml/schema/Member/Membership.xml
index 37cc73000bd05b56a03099c20b990650d0761117..6e1383faf4bcb7012563979603e2a8b5f1005789 100644 (file)
--- a/xml/schema/Member/Membership.xml
+++ b/xml/schema/Member/Membership.xml
@@ -201,14 +201,13 @@
     <name>campaign_id</name>
     <uniqueName>member_campaign_id</uniqueName>
     <type>int unsigned</type>
-    <title>Campaign ID</title>
+    <title>Campaign</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>
   </field>

diff --git a/xml/schema/Pledge/Pledge.xml b/xml/schema/Pledge/Pledge.xml
index 4ca0f3e8554f469e58e4d10af0c44031d6dfdee4..bc9b4928ba7e56403e483604a707e590f5edcb9f 100644 (file)
--- a/xml/schema/Pledge/Pledge.xml
+++ b/xml/schema/Pledge/Pledge.xml
@@ -274,14 +274,13 @@
     <name>campaign_id</name>
     <uniqueName>pledge_campaign_id</uniqueName>
     <type>int unsigned</type>
-    <title>Campaign ID</title>
+    <title>Campaign</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>
   </field>