From 06e5cbe4b653975f5aeb37ea88de6f2f12b143ea Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 14 Nov 2013 11:02:13 -0800 Subject: [PATCH] CRM-13758 - Fix profile fields gender, prefix, suffix --- CRM/Upgrade/Incremental/sql/4.4.2.mysql.tpl | 4 ++++ xml/templates/civicrm_data.tpl | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CRM/Upgrade/Incremental/sql/4.4.2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.4.2.mysql.tpl index 0bbbade4b2..6cf155aa5f 100644 --- a/CRM/Upgrade/Incremental/sql/4.4.2.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.4.2.mysql.tpl @@ -1 +1,5 @@ {* file to handle db changes in 4.4.2 during upgrade *} +-- CRM-13758 +UPDATE civicrm_uf_field SET field_name = 'gender_id' WHERE field_name = 'gender'; +UPDATE civicrm_uf_field SET field_name = 'prefix_id' WHERE field_name = 'individual_prefix'; +UPDATE civicrm_uf_field SET field_name = 'suffix_id' WHERE field_name = 'individual_suffix'; diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index aeb27d2e94..0ce8e322b2 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -1377,7 +1377,7 @@ INSERT INTO civicrm_uf_field ( 7, 'email', 1, 0, 7, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Primary Email{/ts}', 'Contact', NULL, NULL), ( 7, 'group', 1, 0, 8, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Groups{/ts}', 'Contact', NULL, NULL), ( 7, 'tag', 1, 0, 9, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Tags{/ts}', 'Contact', NULL, NULL), - ( 7, 'gender', 1 ,0 ,10 ,'User and User Admin Only' ,0 ,0 ,NULL, '{ts escape="sql"}Gender{/ts}' ,'Individual' ,NULL, NULL), + ( 7, 'gender_id', 1 ,0 ,10 ,'User and User Admin Only' ,0 ,0 ,NULL, '{ts escape="sql"}Gender{/ts}' ,'Individual' ,NULL, NULL), ( 7, 'birth_date', 1 ,0 ,11 ,'User and User Admin Only' ,0 ,0 ,NULL, '{ts escape="sql"}Date of Birth{/ts}' ,'Individual' ,NULL, NULL), ( 8, 'street_address', 1, 1, 1, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}Street Address (Home){/ts}', 'Contact', NULL, NULL), ( 8, 'city', 1, 1, 2, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}City (Home){/ts}', 'Contact', NULL, NULL), -- 2.25.1