From 61ce9b45feb0058d1464bf3c5fc3dfc5c494dc0b Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Fri, 22 Aug 2014 20:38:21 +1200 Subject: [PATCH] CRM-15168 add titles to some xml fields --- xml/schema/ACL/ACL.xml | 12 +++++++----- xml/schema/Batch/Batch.xml | 17 +++++++++++++++++ xml/schema/Core/Address.xml | 17 +++++++++++++++++ xml/schema/Core/UFGroup.xml | 20 +++++++++++++++----- xml/schema/Core/UFJoin.xml | 8 ++++++++ xml/schema/Core/UFMatch.xml | 8 +++++++- xml/schema/Core/WordReplacement.xml | 27 ++++++++++++++++----------- 7 files changed, 87 insertions(+), 22 deletions(-) diff --git a/xml/schema/ACL/ACL.xml b/xml/schema/ACL/ACL.xml index 62fc944b6c..a735e3c5db 100644 --- a/xml/schema/ACL/ACL.xml +++ b/xml/schema/ACL/ACL.xml @@ -27,7 +27,7 @@ Text - 1.6 + 1.6 deny @@ -37,8 +37,8 @@ Is this ACL entry Allow (0) or Deny (1) ? Radio - - 1.6 + + 1.6 entity_table @@ -51,6 +51,7 @@ entity_id int unsigned + Entity ID ID of the object possessing this ACL 1.6 @@ -62,6 +63,7 @@ operation varchar + ACL Operation 8 true What operation does this ACL entry control? @@ -71,7 +73,7 @@ Select - 1.6 + 1.6 object_table @@ -91,7 +93,7 @@ varchar 64 If this is a grant/revoke entry, what table are we granting? - 1.6 + 1.6 acl_id diff --git a/xml/schema/Batch/Batch.xml b/xml/schema/Batch/Batch.xml index 7606115126..2841971a01 100644 --- a/xml/schema/Batch/Batch.xml +++ b/xml/schema/Batch/Batch.xml @@ -8,6 +8,7 @@ 3.3 id + Batch ID int unsigned true Unique Address ID @@ -19,6 +20,7 @@ name + Batch Name varchar 64 Variable name/programmatic handle for this batch. @@ -44,6 +46,7 @@ title + Batch Title varchar 64 true @@ -55,6 +58,7 @@ description + Batch Description text Description of this batch set. true @@ -67,6 +71,7 @@ created_id + Batch Created By int unsigned FK to Contact ID 3.3 @@ -80,6 +85,7 @@ created_date + Batch Created Date datetime When was this item created 3.3 @@ -89,12 +95,14 @@ modified_id + Batch Modified By int unsigned FK to Contact ID 3.3 modified_date + Batch Modified Date datetime When was this item created 3.3 @@ -108,6 +116,7 @@ saved_search_id + Batch Smart Group int unsigned FK to Saved Search ID 4.1 @@ -124,6 +133,7 @@ status_id + Batch Status int unsigned true fk to Batch Status options in civicrm_option_values @@ -137,6 +147,7 @@ type_id + Batch Type int unsigned fk to Batch Type options in civicrm_option_values 4.2 @@ -149,6 +160,7 @@ mode_id + Batch Mode int unsigned fk to Batch mode options in civicrm_option_values 4.2 @@ -161,6 +173,7 @@ total + Batch Total decimal Total amount for this batch. 4.2 @@ -170,6 +183,7 @@ item_count + Batch Number of Items int unsigned Number of items in a batch. 4.2 @@ -179,6 +193,7 @@ payment_instrument_id + Batch Payment Instrument int unsigned fk to Payment Instrument options in civicrm_option_values @@ -191,11 +206,13 @@ exported_date + Batch Exported Date datetime 4.3 data + Batch Data longtext cache entered data 4.4 diff --git a/xml/schema/Core/Address.xml b/xml/schema/Core/Address.xml index 25cb447f23..9bee1de755 100644 --- a/xml/schema/Core/Address.xml +++ b/xml/schema/Core/Address.xml @@ -10,6 +10,7 @@ id int unsigned + Address ID true Unique Address ID 1.1 @@ -20,6 +21,7 @@ contact_id + Contact ID int unsigned FK to Contact ID 2.0 @@ -66,6 +68,7 @@ is_billing + Is Billing Address boolean 0 Is this the billing address. @@ -89,6 +92,7 @@ street_number + Street Number int true Numeric portion of address number on the street, e.g. For 112A Main St, the street_number = 112. @@ -96,6 +100,7 @@ street_number_suffix + Street Number Suffix varchar 8 true @@ -104,6 +109,7 @@ street_number_predirectional + Street Direction Prefix varchar 8 Directional prefix, e.g. SE Main St, SE is the prefix. @@ -112,6 +118,7 @@ street_name varchar + Street Name 64 true Actual street name, excluding St, Dr, Rd, Ave, e.g. For 112 Main St, the street_name = Main. @@ -124,6 +131,7 @@ street_type + Street Type varchar 8 St, Rd, Dr, etc. @@ -131,6 +139,7 @@ street_number_postdirectional + Street Direction Suffix varchar 8 Directional prefix, e.g. Main St S, S is the suffix. @@ -138,6 +147,7 @@ street_unit + Street Unit varchar 16 true @@ -168,6 +178,7 @@ supplemental_address_3 + Supplemental Address 3 varchar 96 Supplemental Address Information, Line 3 @@ -192,6 +203,7 @@ county_id int unsigned + County Which County does this address belong to. civicrm_county
@@ -262,6 +274,7 @@ usps_adc + USPS Code varchar 32 USPS Bulk mailing code. @@ -295,6 +308,7 @@ geo_code_1 + Latitude float true /geo/i @@ -303,6 +317,7 @@ geo_code_2 + Longitude float Longitude true @@ -311,6 +326,7 @@ manual_geo_code + Is manually geocoded boolean 0 Is this a manually entered geo code @@ -318,6 +334,7 @@ timezone + Timezone varchar 8 Timezone expressed as a UTC offset - e.g. United States CST would be written as "UTC-6". diff --git a/xml/schema/Core/UFGroup.xml b/xml/schema/Core/UFGroup.xml index 19db8bf789..e9ae71bad8 100644 --- a/xml/schema/Core/UFGroup.xml +++ b/xml/schema/Core/UFGroup.xml @@ -9,6 +9,7 @@ true id + Profile ID int unsigned true Unique table ID @@ -20,6 +21,7 @@ is_active + Profile Is Active boolean 1 Is this form currently active? If false, hide all related fields for all sharing contexts. @@ -27,6 +29,7 @@ group_type + Profile Group Type varchar 255 true @@ -83,6 +86,7 @@ help_post + Profile Post Text text true Description and/or help text to display after fields in form. @@ -95,6 +99,7 @@ weight + Profile Weight int true 1 @@ -104,6 +109,7 @@ limit_listings_group_id + Profile Search Limit Group int unsigned Group id, foriegn key from civicrm_group 1.4 @@ -189,12 +195,14 @@ is_reserved + Profile Is Reserved boolean Is this group reserved for use by some other CiviCRM functionality? 3.0 name + Profile Name varchar 64 Name of the UF group for directly addressing it in the codebase @@ -202,6 +210,7 @@ created_id + Profile Created By int unsigned FK to civicrm_contact, who created this UF group 3.0 @@ -221,10 +230,11 @@ 3.0 - is_proximity_search - boolean - 0 - Should we include proximity search feature in this profile search form? - 3.2 + is_proximity_search + Include Proximity Search? + boolean + 0 + Should we include proximity search feature in this profile search form? + 3.2 diff --git a/xml/schema/Core/UFJoin.xml b/xml/schema/Core/UFJoin.xml index 76a4845499..3b463b9047 100644 --- a/xml/schema/Core/UFJoin.xml +++ b/xml/schema/Core/UFJoin.xml @@ -9,6 +9,7 @@ true id + UF Join ID int unsigned true Unique table ID @@ -20,6 +21,7 @@ is_active + Profile Use is active boolean 1 Is this join currently active? @@ -27,6 +29,7 @@ module + Profile Module varchar 64 true @@ -35,6 +38,7 @@ entity_table + Profile Entity Table varchar 64 Name of table where item being referenced is stored. Modules which only need a single collection of uf_join instances may choose not to populate entity_table and entity_id. @@ -42,6 +46,7 @@ entity_id + Profile Entity ID int unsigned Foreign key to the referenced item. 1.3 @@ -60,6 +65,7 @@ weight + Profile Weight int true 1 @@ -68,6 +74,7 @@ uf_group_id + Profile ID int unsigned true Which form does this field belong to. @@ -89,6 +96,7 @@ module_data + Profile Use Data longtext Json serialized array of data used by the ufjoin.module 4.5 diff --git a/xml/schema/Core/UFMatch.xml b/xml/schema/Core/UFMatch.xml index 6f6de437fe..a4481d27fd 100644 --- a/xml/schema/Core/UFMatch.xml +++ b/xml/schema/Core/UFMatch.xml @@ -9,6 +9,7 @@ true id + UF Match ID int unsigned true System generated ID. @@ -20,6 +21,7 @@ domain_id + UF Match Domain ID int unsigned true Which Domain is this match entry for @@ -38,6 +40,7 @@ uf_id + CMS ID int unsigned true UF ID @@ -50,13 +53,15 @@ uf_name + CMS Unique Identifier varchar 128 UF Name 1.9.kabissa - contact_id + contact_id + CiviCRM Contact ID int unsigned FK to Contact ID 1.1 @@ -79,6 +84,7 @@ language + Preferred Language varchar 5 UI language preferred by the given user/contact diff --git a/xml/schema/Core/WordReplacement.xml b/xml/schema/Core/WordReplacement.xml index 70654aa77c..e3a544ce29 100644 --- a/xml/schema/Core/WordReplacement.xml +++ b/xml/schema/Core/WordReplacement.xml @@ -8,6 +8,7 @@ 4.4 id + Word Replacement ID int unsigned true Word replacement ID @@ -19,6 +20,7 @@ find_word + Replaced Word varchar 255 utf8_bin @@ -27,6 +29,7 @@ replace_word + Replacement Word varchar 255 utf8_bin @@ -49,20 +52,22 @@ 4.4 - match_type - varchar - 16 - "wildcardMatch" - - CRM_Core_SelectValues::getWordReplacementMatchType - - 4.4 - - Select - + match_type + Word Replacement Match Type + varchar + 16 + "wildcardMatch" + + CRM_Core_SelectValues::getWordReplacementMatchType + + 4.4 + + Select + domain_id + Word Replacement Domain ID int unsigned civicrm_domain
-- 2.25.1