From c2b4755a8f9898e4e5a9b11690f1b861bd534f94 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Thu, 10 Jul 2014 10:52:26 +1200 Subject: [PATCH] add pseudoconstants for domain_id --- xml/schema/Core/Dashboard.xml | 5 +++++ xml/schema/Core/Job.xml | 5 +++++ xml/schema/Core/JobLog.xml | 5 +++++ xml/schema/Core/MailSettings.xml | 5 +++++ xml/schema/Core/Menu.xml | 5 +++++ xml/schema/Core/Navigation.xml | 5 +++++ xml/schema/Core/OptionValue.xml | 5 +++++ xml/schema/Core/Preferences.xml | 5 +++++ xml/schema/Core/Setting.xml | 5 +++++ xml/schema/Core/WordReplacement.xml | 5 +++++ xml/schema/Financial/PaymentProcessor.xml | 5 +++++ xml/schema/Mailing/Mailing.xml | 9 +++++++-- xml/schema/Member/MembershipType.xml | 5 +++++ xml/schema/Price/PriceSet.xml | 5 +++++ xml/schema/Report/ReportInstance.xml | 7 ++++++- 15 files changed, 78 insertions(+), 3 deletions(-) diff --git a/xml/schema/Core/Dashboard.xml b/xml/schema/Core/Dashboard.xml index 2c04c1a464..a26178cdea 100644 --- a/xml/schema/Core/Dashboard.xml +++ b/xml/schema/Core/Dashboard.xml @@ -20,6 +20,11 @@ domain_id int unsigned true + + civicrm_domain
+ id + name + Domain for dashboard 3.1 diff --git a/xml/schema/Core/Job.xml b/xml/schema/Core/Job.xml index 4597172cd2..a14a271d8d 100644 --- a/xml/schema/Core/Job.xml +++ b/xml/schema/Core/Job.xml @@ -22,6 +22,11 @@ domain_id int unsigned true + + civicrm_domain
+ id + name + Which Domain is this scheduled job for 4.1 diff --git a/xml/schema/Core/JobLog.xml b/xml/schema/Core/JobLog.xml index 5c3d57bcf9..4917b91c3f 100644 --- a/xml/schema/Core/JobLog.xml +++ b/xml/schema/Core/JobLog.xml @@ -22,6 +22,11 @@ domain_id int unsigned true + + civicrm_domain
+ id + name + Which Domain is this scheduled job for 4.1 diff --git a/xml/schema/Core/MailSettings.xml b/xml/schema/Core/MailSettings.xml index 1b4d7cf6ff..f887cfbc9e 100644 --- a/xml/schema/Core/MailSettings.xml +++ b/xml/schema/Core/MailSettings.xml @@ -19,6 +19,11 @@ domain_id int unsigned true + + civicrm_domain
+ id + name + Which Domain is this match entry for 3.1 diff --git a/xml/schema/Core/Menu.xml b/xml/schema/Core/Menu.xml index 9c634d4310..3f983d4ab8 100644 --- a/xml/schema/Core/Menu.xml +++ b/xml/schema/Core/Menu.xml @@ -20,6 +20,11 @@ domain_id int unsigned true + + civicrm_domain
+ id + name + Which Domain is this menu item for 3.0 diff --git a/xml/schema/Core/Navigation.xml b/xml/schema/Core/Navigation.xml index 7f20335f41..8efe8f555c 100644 --- a/xml/schema/Core/Navigation.xml +++ b/xml/schema/Core/Navigation.xml @@ -20,6 +20,11 @@ domain_id int unsigned true + + civicrm_domain
+ id + name + Which Domain is this navigation item for 3.0 diff --git a/xml/schema/Core/OptionValue.xml b/xml/schema/Core/OptionValue.xml index 217b5632f0..f18a8022d0 100644 --- a/xml/schema/Core/OptionValue.xml +++ b/xml/schema/Core/OptionValue.xml @@ -152,6 +152,11 @@ domain_id int unsigned + + civicrm_domain
+ id + name + Which Domain is this option value for 3.1 diff --git a/xml/schema/Core/Preferences.xml b/xml/schema/Core/Preferences.xml index 22e3b055f9..c3afa66bdb 100644 --- a/xml/schema/Core/Preferences.xml +++ b/xml/schema/Core/Preferences.xml @@ -22,6 +22,11 @@ domain_id int unsigned true + + civicrm_domain
+ id + name + Which Domain is this menu item for 3.0 diff --git a/xml/schema/Core/Setting.xml b/xml/schema/Core/Setting.xml index 6dd7c9d3fb..fdd016e64d 100644 --- a/xml/schema/Core/Setting.xml +++ b/xml/schema/Core/Setting.xml @@ -47,6 +47,11 @@ domain_id int unsigned true + + civicrm_domain
+ id + name + Which Domain is this menu item for 4.1 diff --git a/xml/schema/Core/WordReplacement.xml b/xml/schema/Core/WordReplacement.xml index 9c64a1afe6..70654aa77c 100644 --- a/xml/schema/Core/WordReplacement.xml +++ b/xml/schema/Core/WordReplacement.xml @@ -64,6 +64,11 @@ domain_id int unsigned + + civicrm_domain
+ id + name + FK to Domain ID. This is for Domain specific word replacement 1.1 diff --git a/xml/schema/Financial/PaymentProcessor.xml b/xml/schema/Financial/PaymentProcessor.xml index fe3916b1a2..a5bb7f4fb0 100644 --- a/xml/schema/Financial/PaymentProcessor.xml +++ b/xml/schema/Financial/PaymentProcessor.xml @@ -20,6 +20,11 @@ domain_id int unsigned true + + civicrm_domain
+ id + name + Which Domain is this match entry for 3.0 diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml index bf28665456..182f7b34dd 100644 --- a/xml/schema/Mailing/Mailing.xml +++ b/xml/schema/Mailing/Mailing.xml @@ -18,6 +18,11 @@ domain_id int unsigned + + civicrm_domain
+ id + name + Which site is this mailing for 3.4 @@ -209,7 +214,7 @@ created_id int unsigned - FK to Contact ID who first created this mailing + FK to Contact ID who first created this mailing created_id @@ -368,4 +373,4 @@ hash 4.5 - \ No newline at end of file + diff --git a/xml/schema/Member/MembershipType.xml b/xml/schema/Member/MembershipType.xml index 423b43bc86..ef26a62a52 100644 --- a/xml/schema/Member/MembershipType.xml +++ b/xml/schema/Member/MembershipType.xml @@ -22,6 +22,11 @@ domain_id int unsigned true + + civicrm_domain
+ id + name + Which Domain is this match entry for 3.0 diff --git a/xml/schema/Price/PriceSet.xml b/xml/schema/Price/PriceSet.xml index 3ada6ae389..3b961957de 100644 --- a/xml/schema/Price/PriceSet.xml +++ b/xml/schema/Price/PriceSet.xml @@ -20,6 +20,11 @@ domain_id int unsigned + + civicrm_domain
+ id + name + Which Domain is this price-set for 3.1 diff --git a/xml/schema/Report/ReportInstance.xml b/xml/schema/Report/ReportInstance.xml index 9af6ab123f..22afdffe57 100644 --- a/xml/schema/Report/ReportInstance.xml +++ b/xml/schema/Report/ReportInstance.xml @@ -22,8 +22,13 @@ domain_id Report Instance Domain ID int unsigned + + civicrm_domain
+ id + name + true - Which Domain is this instance for + Which Domain is this instance for 3.1 -- 2.25.1