From b05e6d0d641a3eab3ab24c9c2ed6286f4d0eec3a Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Fri, 22 Aug 2014 21:22:36 +1200 Subject: [PATCH] CRM-15168 more title metadate fixes (& some whitespace snuck in) --- api/v3/Case.php | 1 + xml/schema/Contribute/Contribution.xml | 7 +- xml/schema/Core/Phone.xml | 189 +++++++++++++------------ xml/schema/Core/Setting.xml | 9 ++ 4 files changed, 110 insertions(+), 96 deletions(-) diff --git a/api/v3/Case.php b/api/v3/Case.php index 6cde101596..a19d0f7d09 100644 --- a/api/v3/Case.php +++ b/api/v3/Case.php @@ -149,6 +149,7 @@ function _civicrm_api3_case_create_spec(&$params) { $params['status_id']['api.default'] = 1; $params['creator_id']['api.default'] = 'user_contact_id'; $params['creator_id']['type'] = CRM_Utils_Type::T_INT; + $params['creator_id']['title'] = 'Case Created By'; $params['start_date']['api.default'] = 'now'; $params['medium_id'] = array( 'name' => 'medium_id', diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml index b74263329e..adb74025d3 100644 --- a/xml/schema/Contribute/Contribution.xml +++ b/xml/schema/Contribute/Contribution.xml @@ -224,7 +224,7 @@ unique invoice id, system generated or passed in Text - + 1.3 @@ -267,7 +267,7 @@ Text - 1.3 + 1.3 receipt_date @@ -279,7 +279,7 @@ Select Date - 1.3 + 1.3 thankyou_date @@ -342,6 +342,7 @@ contribution_recur_id + Recurring Contribution ID int unsigned Conditional foreign key to civicrm_contribution_recur id. Each contribution made in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events. 1.4 diff --git a/xml/schema/Core/Phone.xml b/xml/schema/Core/Phone.xml index ed2625d948..4f01f75e56 100644 --- a/xml/schema/Core/Phone.xml +++ b/xml/schema/Core/Phone.xml @@ -8,43 +8,45 @@ 1.1 true - id - int unsigned - true - Unique Phone ID - 1.1 + id + Phone ID + int unsigned + true + Unique Phone ID + 1.1 - id - true + id + true - contact_id - int unsigned - FK to Contact ID - 2.0 + contact_id + Phone Contact + int unsigned + FK to Contact ID + 2.0 - contact_id - civicrm_contact
- id - 2.0 - CASCADE + contact_id + civicrm_contact
+ id + 2.0 + CASCADE - location_type_id - Phone Location Type - int unsigned - Which Location does this phone belong to. - - civicrm_location_type
- id - display_name - - - Select - - 2.0 + location_type_id + Phone Location Type + int unsigned + Which Location does this phone belong to. + + civicrm_location_type
+ id + display_name + + + Select + + 2.0 index_location_type @@ -52,12 +54,12 @@ 2.0 - is_primary - Is Phone Primary? - boolean - 0 - Is this the primary phone for this contact and location. - 1.1 + is_primary + Is Phone Primary? + boolean + 0 + Is this the primary phone for this contact and location. + 1.1 index_is_primary @@ -65,11 +67,12 @@ 2.0 - is_billing - boolean - 0 - Is this the billing? - 2.0 + is_billing + Is Billing Phone + boolean + 0 + Is this the billing? + 2.0 index_is_billing @@ -77,48 +80,48 @@ 2.0 - mobile_provider_id - int unsigned - Which Mobile Provider does this phone belong to. - 1.1 + mobile_provider_id + int unsigned + Which Mobile Provider does this phone belong to. + 1.1 - UI_mobile_provider_id - mobile_provider_id - 1.6 + UI_mobile_provider_id + mobile_provider_id + 1.6 - phone - varchar - 32 - true - /phone/i - /^[\d\(\)\-\.\s]+$/ - Complete phone number. - 1.1 + phone + varchar + 32 + true + /phone/i + /^[\d\(\)\-\.\s]+$/ + Complete phone number. + 1.1 - phone_ext - Phone Extension - varchar - 16 - - Text - FOUR - - true - true - /extension/i - /^\d+$/ - Optional extension for a phone number. - 3.3 + phone_ext + Phone Extension + varchar + 16 + + Text + FOUR + + true + true + /extension/i + /^\d+$/ + Optional extension for a phone number. + 3.3 - phone_numeric - varchar - 32 - Phone number stripped of all whitespace, letters, and punctuation. - 4.3 + phone_numeric + varchar + 32 + Phone number stripped of all whitespace, letters, and punctuation. + 4.3 index_phone_numeric @@ -126,26 +129,26 @@ 4.3 - phone_type - enum - Phone, Mobile, Fax, Pager - /phone\s+type/i - /phone|mobile|fax|pager/i - What type of telecom device is this. - 1.1 - 2.2 + phone_type + enum + Phone, Mobile, Fax, Pager + /phone\s+type/i + /phone|mobile|fax|pager/i + What type of telecom device is this. + 1.1 + 2.2 - phone_type_id - Phone Type - int unsigned - Which type of phone does this number belongs. - - phone_type - - - Select - - 2.2 + phone_type_id + Phone Type + int unsigned + Which type of phone does this number belongs. + + phone_type + + + Select + + 2.2 diff --git a/xml/schema/Core/Setting.xml b/xml/schema/Core/Setting.xml index fdd016e64d..08f2978b9c 100644 --- a/xml/schema/Core/Setting.xml +++ b/xml/schema/Core/Setting.xml @@ -8,6 +8,7 @@ 4.1 id + Setting ID int unsigned true 4.1 @@ -18,6 +19,7 @@ group_name + Setting Group varchar 64 true @@ -26,6 +28,7 @@ name + Setting Name varchar 255 Unique name for setting @@ -45,6 +48,7 @@ domain_id + Setting Domain int unsigned true @@ -64,6 +68,7 @@ contact_id + Setting Contact int unsigned FK to Contact ID if the setting is localized to a contact 4.1 @@ -77,12 +82,14 @@ is_domain + Is Domain Setting? boolean Is this setting a contact specific or site wide setting? 4.1 component_id + Setting Component int unsigned Component that this menu item belongs to 4.1 @@ -103,12 +110,14 @@ created_date + Setting Created Date datetime When was the setting created 4.1 created_id + Setting Created By int unsigned FK to civicrm_contact, who created this setting 4.1 -- 2.25.1