From 9e08bf23206c7af73086fbd90d6afbee2b7e58c4 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Tue, 13 May 2014 21:27:03 +1200 Subject: [PATCH] fix use of tabs (std is two spaces) & trailing whitespaces (std is none) --- .../Incremental/sql/4.5.alpha1.mysql.tpl | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl index e74c88f75f..3068a4b48f 100644 --- a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl @@ -284,7 +284,7 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1085 -- CRM-14445 ALTER TABLE `civicrm_option_group` - ADD COLUMN `is_locked` int(1) DEFAULT 0 COMMENT 'A lock to remove the ability to add new options via the UI'; + ADD COLUMN `is_locked` int(1) DEFAULT 0 COMMENT 'A lock to remove the ability to add new options via the UI'; UPDATE `civicrm_option_group` SET is_locked = 1 WHERE name IN ('contribution_status','activity_contacts','advanced_search_options','auto_renew_options','contact_autocomplete_options','batch_status','batch_type','batch_mode','contact_edit_options','contact_reference_options','contact_smart_group_display','contact_view_options','financial_item_status','mapping_type','pcp_status','user_dashboard_options','tag_used_for'); @@ -438,11 +438,11 @@ WHERE civicrm_navigation.url LIKE "%&%" AND civicrm_navigation.url NOT LIKE "%?% -- CRM-14639 SELECT @option_grant_status := id FROM civicrm_option_group WHERE name = 'grant_status'; -UPDATE civicrm_option_value +UPDATE civicrm_option_value SET {if !$multilingual} - label = - CASE + label = + CASE WHEN lower(name) = 'granted' THEN 'Paid' WHEN lower(name) = 'approved' @@ -450,23 +450,23 @@ SET WHEN lower(name) = 'rejected' THEN 'Ineligible' ELSE 'Submitted' - END, + END, {else} {foreach from=$locales item=locale} - label_{$locale} = - CASE + label_{$locale} = + CASE WHEN lower(name) = 'granted' - THEN 'Paid' - WHEN lower(name) = 'approved' - THEN 'Eligible' - WHEN lower(name) = 'rejected' - THEN 'Ineligible' - ELSE 'Submitted' + THEN 'Paid' + WHEN lower(name) = 'approved' + THEN 'Eligible' + WHEN lower(name) = 'rejected' + THEN 'Ineligible' + ELSE 'Submitted' END, {/foreach} {/if} -name = -CASE +name = +CASE WHEN lower(name) = 'granted' THEN 'Paid' WHEN lower(name) = 'approved' @@ -499,21 +499,21 @@ WHERE co.id IS NULL; -- Fix trailing single quote in grant status label {if !$multilingual} UPDATE civicrm_option_value v - INNER JOIN civicrm_option_group g - ON v.option_group_id = g.id AND g.name = 'grant_status' - SET label = 'Awaiting Information' - WHERE v.label = 'Awaiting Information\'' and v.name = 'Awaiting Information'; + INNER JOIN civicrm_option_group g + ON v.option_group_id = g.id AND g.name = 'grant_status' + SET label = 'Awaiting Information' + WHERE v.label = 'Awaiting Information\'' and v.name = 'Awaiting Information'; {else} UPDATE civicrm_option_value v INNER JOIN civicrm_option_group g ON v.option_group_id = g.id AND g.name = 'grant_status' SET {foreach from=$locales item=locale} - v.label_{$locale} = CASE + v.label_{$locale} = CASE WHEN v.label_{$locale} = 'Awaiting Information\'' THEN 'Awaiting Information' ELSE v.label_{$locale} END, {/foreach} v.name = v.name WHERE v.name = 'Awaiting Information'; -{/if} \ No newline at end of file +{/if} -- 2.25.1