add pseudoconstants for domain_id

diff --git a/xml/schema/Core/Dashboard.xml b/xml/schema/Core/Dashboard.xml
index 2c04c1a4643d2df55b832009135b52259852861c..a26178cdeab91aa44dc392254280fe52ee1e0c38 100644 (file)
--- a/xml/schema/Core/Dashboard.xml
+++ b/xml/schema/Core/Dashboard.xml
@@ -20,6 +20,11 @@
         <name>domain_id</name>
         <type>int unsigned</type>
         <required>true</required>
+        <pseudoconstant>
+            <table>civicrm_domain</table>
+            <keyColumn>id</keyColumn>
+            <labelColumn>name</labelColumn>
+        </pseudoconstant>
         <comment>Domain for dashboard</comment>
         <add>3.1</add>
     </field>

diff --git a/xml/schema/Core/Job.xml b/xml/schema/Core/Job.xml
index 4597172cd2addb5b3b29bd3e3e98b4571ec64bbc..a14a271d8d86c483e123acdd2cb75e93d706be69 100644 (file)
--- a/xml/schema/Core/Job.xml
+++ b/xml/schema/Core/Job.xml
@@ -22,6 +22,11 @@
       <name>domain_id</name>
       <type>int unsigned</type>
       <required>true</required>
+      <pseudoconstant>
+          <table>civicrm_domain</table>
+          <keyColumn>id</keyColumn>
+          <labelColumn>name</labelColumn>
+      </pseudoconstant>
       <comment>Which Domain is this scheduled job for</comment>
       <add>4.1</add>
   </field>

diff --git a/xml/schema/Core/JobLog.xml b/xml/schema/Core/JobLog.xml
index 5c3d57bcf9b7f2a2dc5da98b7e887db3a47b5de2..4917b91c3fe64a0a945e1bf9fe07cbb72c4e26c7 100644 (file)
--- a/xml/schema/Core/JobLog.xml
+++ b/xml/schema/Core/JobLog.xml
@@ -22,6 +22,11 @@
       <name>domain_id</name>
       <type>int unsigned</type>
       <required>true</required>
+      <pseudoconstant>
+          <table>civicrm_domain</table>
+          <keyColumn>id</keyColumn>
+          <labelColumn>name</labelColumn>
+      </pseudoconstant>
       <comment>Which Domain is this scheduled job for</comment>
       <add>4.1</add>
   </field>

diff --git a/xml/schema/Core/MailSettings.xml b/xml/schema/Core/MailSettings.xml
index 1b4d7cf6ff7952a54b5cbacf4c8acb1e446b8789..f887cfbc9ed5b875eb9123eb39a2201e754c1ba2 100644 (file)
--- a/xml/schema/Core/MailSettings.xml
+++ b/xml/schema/Core/MailSettings.xml
@@ -19,6 +19,11 @@
       <name>domain_id</name>
       <type>int unsigned</type>
       <required>true</required>
+      <pseudoconstant>
+          <table>civicrm_domain</table>
+          <keyColumn>id</keyColumn>
+          <labelColumn>name</labelColumn>
+      </pseudoconstant>
       <comment>Which Domain is this match entry for</comment>
       <add>3.1</add>
   </field>

diff --git a/xml/schema/Core/Menu.xml b/xml/schema/Core/Menu.xml
index 9c634d43106a0aacd6fcdb68f4158f90a1dec32b..3f983d4ab87606631ec0d4b283dee03320e7afbf 100644 (file)
--- a/xml/schema/Core/Menu.xml
+++ b/xml/schema/Core/Menu.xml
@@ -20,6 +20,11 @@
       <name>domain_id</name>
       <type>int unsigned</type>
       <required>true</required>
+      <pseudoconstant>
+          <table>civicrm_domain</table>
+          <keyColumn>id</keyColumn>
+          <labelColumn>name</labelColumn>
+      </pseudoconstant>
       <comment>Which Domain is this menu item for</comment>
       <add>3.0</add>
   </field>

diff --git a/xml/schema/Core/Navigation.xml b/xml/schema/Core/Navigation.xml
index 7f20335f41871c9d4bd1a43ee1a6a524c6c94ede..8efe8f555c332209f1b193922dd8da9115d1e2a3 100644 (file)
--- a/xml/schema/Core/Navigation.xml
+++ b/xml/schema/Core/Navigation.xml
@@ -20,6 +20,11 @@
       <name>domain_id</name>
       <type>int unsigned</type>
       <required>true</required>
+      <pseudoconstant>
+          <table>civicrm_domain</table>
+          <keyColumn>id</keyColumn>
+          <labelColumn>name</labelColumn>
+      </pseudoconstant>
       <comment>Which Domain is this navigation item for</comment>
       <add>3.0</add>
   </field>

diff --git a/xml/schema/Core/OptionValue.xml b/xml/schema/Core/OptionValue.xml
index 217b5632f07683fd534412ac0d2d31f76b911e3b..f18a8022d072e72428b6d6fbfb44d1b08abafc11 100644 (file)
--- a/xml/schema/Core/OptionValue.xml
+++ b/xml/schema/Core/OptionValue.xml
@@ -152,6 +152,11 @@
   <field>
       <name>domain_id</name>
       <type>int unsigned</type>
+      <pseudoconstant>
+          <table>civicrm_domain</table>
+          <keyColumn>id</keyColumn>
+          <labelColumn>name</labelColumn>
+      </pseudoconstant>
       <comment>Which Domain is this option value for</comment>
       <add>3.1</add>
   </field>

diff --git a/xml/schema/Core/Preferences.xml b/xml/schema/Core/Preferences.xml
index 22e3b055f9a1dbc22caddff8b2b9d03903840195..c3afa66bdbb8c2ea6ed31a7399e80e595c1a7ef8 100644 (file)
--- a/xml/schema/Core/Preferences.xml
+++ b/xml/schema/Core/Preferences.xml
@@ -22,6 +22,11 @@
       <name>domain_id</name>
       <type>int unsigned</type>
       <required>true</required>
+      <pseudoconstant>
+          <table>civicrm_domain</table>
+          <keyColumn>id</keyColumn>
+          <labelColumn>name</labelColumn>
+      </pseudoconstant>
       <comment>Which Domain is this menu item for</comment>
       <add>3.0</add>
   </field>

diff --git a/xml/schema/Core/Setting.xml b/xml/schema/Core/Setting.xml
index 6dd7c9d3fb61caeac7f3b223a1269d66df272a34..fdd016e64d383ce6073cb07c3550e15b1d487ec8 100644 (file)
--- a/xml/schema/Core/Setting.xml
+++ b/xml/schema/Core/Setting.xml
@@ -47,6 +47,11 @@
       <name>domain_id</name>
       <type>int unsigned</type>
       <required>true</required>
+      <pseudoconstant>
+          <table>civicrm_domain</table>
+          <keyColumn>id</keyColumn>
+          <labelColumn>name</labelColumn>
+      </pseudoconstant>
       <comment>Which Domain is this menu item for</comment>
       <add>4.1</add>
   </field>

diff --git a/xml/schema/Core/WordReplacement.xml b/xml/schema/Core/WordReplacement.xml
index 9c64a1afe6eee2bd7099120f7234df524fa5a53d..70654aa77c9eee590ad82ae4996ff3ee43701a71 100644 (file)
--- a/xml/schema/Core/WordReplacement.xml
+++ b/xml/schema/Core/WordReplacement.xml
@@ -64,6 +64,11 @@
   <field>
     <name>domain_id</name>
     <type>int unsigned</type>
+    <pseudoconstant>
+      <table>civicrm_domain</table>
+        <keyColumn>id</keyColumn>
+        <labelColumn>name</labelColumn>
+    </pseudoconstant>
     <comment>FK to Domain ID. This is for Domain specific word replacement</comment>
     <add>1.1</add>
   </field>

diff --git a/xml/schema/Financial/PaymentProcessor.xml b/xml/schema/Financial/PaymentProcessor.xml
index fe3916b1a2eb0ff0ef15479e80439009603e769d..a5bb7f4fb0e248306716e37721792e9830436d9f 100644 (file)
--- a/xml/schema/Financial/PaymentProcessor.xml
+++ b/xml/schema/Financial/PaymentProcessor.xml
@@ -20,6 +20,11 @@
     <name>domain_id</name>
     <type>int unsigned</type>
     <required>true</required>
+    <pseudoconstant>
+      <table>civicrm_domain</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
     <comment>Which Domain is this match entry for</comment>
     <add>3.0</add>
   </field>

diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml
index bf2866545674d5f8d1268b070aab9dd3f38bd313..182f7b34dd69aa2592032054667134b44c081a41 100644 (file)
--- a/xml/schema/Mailing/Mailing.xml
+++ b/xml/schema/Mailing/Mailing.xml
@@ -18,6 +18,11 @@
   <field>
       <name>domain_id</name>
       <type>int unsigned</type>
+      <pseudoconstant>
+          <table>civicrm_domain</table>
+          <keyColumn>id</keyColumn>
+          <labelColumn>name</labelColumn>
+      </pseudoconstant>
       <comment>Which site is this mailing for</comment>
       <add>3.4</add>
   </field>
@@ -209,7 +214,7 @@
   <field>
       <name>created_id</name>
       <type>int unsigned</type>
-      <comment>FK to Contact ID who first created this mailing</comment>      
+      <comment>FK to Contact ID who first created this mailing</comment>
   </field>
   <foreignKey>
        <name>created_id</name>
@@ -368,4 +373,4 @@
        <fieldName>hash</fieldName>
        <add>4.5</add>
   </index>
-</table>
\ No newline at end of file
+</table>

diff --git a/xml/schema/Member/MembershipType.xml b/xml/schema/Member/MembershipType.xml
index 423b43bc86a38922a64f2ef0dad3c673e6eebba8..ef26a62a5290b26206c13cc401aca5eb27b8ba9f 100644 (file)
--- a/xml/schema/Member/MembershipType.xml
+++ b/xml/schema/Member/MembershipType.xml
@@ -22,6 +22,11 @@
     <name>domain_id</name>
     <type>int unsigned</type>
     <required>true</required>
+    <pseudoconstant>
+      <table>civicrm_domain</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
     <comment>Which Domain is this match entry for</comment>
     <add>3.0</add>
   </field>

diff --git a/xml/schema/Price/PriceSet.xml b/xml/schema/Price/PriceSet.xml
index 3ada6ae3892d0b4dee4b9fec77424b90e2afa012..3b961957de097d1d1a213b811d3d8cea8354131c 100644 (file)
--- a/xml/schema/Price/PriceSet.xml
+++ b/xml/schema/Price/PriceSet.xml
@@ -20,6 +20,11 @@
   <field>
     <name>domain_id</name>
     <type>int unsigned</type>
+    <pseudoconstant>
+      <table>civicrm_domain</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
     <comment>Which Domain is this price-set for</comment>
     <add>3.1</add>
     <html>

diff --git a/xml/schema/Report/ReportInstance.xml b/xml/schema/Report/ReportInstance.xml
index 9af6ab123f4dc97978a552d6b518837476c9b612..22afdffe57594122b5d6a296f1505d0466a15e23 100644 (file)
--- a/xml/schema/Report/ReportInstance.xml
+++ b/xml/schema/Report/ReportInstance.xml
@@ -22,8 +22,13 @@
       <name>domain_id</name>
       <title>Report Instance Domain ID</title>
       <type>int unsigned</type>
+      <pseudoconstant>
+        <table>civicrm_domain</table>
+        <keyColumn>id</keyColumn>
+        <labelColumn>name</labelColumn>
+      </pseudoconstant>
       <required>true</required>
-      <comment>Which Domain is this instance for</comment>      
+      <comment>Which Domain is this instance for</comment>
       <add>3.1</add>
   </field>
   <foreignKey>