From 5b8e40ab7cd7cce221fd1be6cd74b34e4604e978 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 6 Nov 2013 14:02:54 -0800 Subject: [PATCH] CRM-13698 - Fix option_value.name to match civivolunteer --- CRM/Upgrade/Incremental/php/FourFour.php | 4 ++-- xml/templates/civicrm_data.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Upgrade/Incremental/php/FourFour.php b/CRM/Upgrade/Incremental/php/FourFour.php index 12d5ffc377..fe8ec704a8 100644 --- a/CRM/Upgrade/Incremental/php/FourFour.php +++ b/CRM/Upgrade/Incremental/php/FourFour.php @@ -169,8 +169,8 @@ class CRM_Upgrade_Incremental_php_FourFour { $insertStatus[] = "(%1, 'Available', %2, 'Available', NULL, 0, NULL, %3, 0, 0, 1, NULL, NULL)"; $avinc = $inc = 1; } - if (!CRM_Core_OptionGroup::getValue('activity_status', 'No-show', 'name')) { - $insertStatus[] = "(%1, 'No-show', %4, 'No-show', NULL, 0, NULL, %5, 0, 0, 1, NULL, NULL)"; + if (!CRM_Core_OptionGroup::getValue('activity_status', 'No_show', 'name')) { + $insertStatus[] = "(%1, 'No-show', %4, 'No_show', NULL, 0, NULL, %5, 0, 0, 1, NULL, NULL)"; $nsinc = $inc + 1; } if (!empty($insertStatus)) { diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index d2f111ccfd..aeb27d2e94 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -604,7 +604,7 @@ VALUES (@option_group_id_acs, '{ts escape="sql"}Unreachable{/ts}', 5, 'Unreachable', NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL), (@option_group_id_acs, '{ts escape="sql"}Not Required{/ts}', 6, 'Not Required', NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL), (@option_group_id_acs, '{ts escape="sql"}Available{/ts}', 7, 'Available', NULL, 0, NULL, 7, NULL, 0, 0, 1, NULL, NULL), - (@option_group_id_acs, '{ts escape="sql"}No-show{/ts}', 8, 'No-show', NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL), + (@option_group_id_acs, '{ts escape="sql"}No-show{/ts}', 8, 'No_show', NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL), (@option_group_id_cas, '{ts escape="sql"}Ongoing{/ts}' , 1, 'Open' , 'Opened', 0, 1, 1, NULL, 0, 1, 1, NULL, NULL), (@option_group_id_cas, '{ts escape="sql"}Resolved{/ts}', 2, 'Closed', 'Closed', 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL), -- 2.25.1