From ec61a2b2c41e74a12a011227e29c0f5c4237b1a1 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 6 Jul 2017 16:51:44 -0700 Subject: [PATCH] CRM-20816 - Rename `auto` to `default` --- CRM/Case/Info.php | 6 +++--- CRM/Case/XMLProcessor/Process.php | 6 +++--- settings/Case.setting.php | 12 ++++++------ templates/CRM/Admin/Form/Setting/Case.tpl | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CRM/Case/Info.php b/CRM/Case/Info.php index 8997ae0f1e..a1e5ebbe21 100644 --- a/CRM/Case/Info.php +++ b/CRM/Case/Info.php @@ -251,7 +251,7 @@ class CRM_Case_Info extends CRM_Core_Component_Info { */ public static function getRedactOptions() { return array( - 'auto' => ts('Auto'), + 'default' => ts('Default'), '0' => ts('Do not redact emails'), '1' => ts('Redact emails'), ); @@ -263,7 +263,7 @@ class CRM_Case_Info extends CRM_Core_Component_Info { */ public static function getMultiClientOptions() { return array( - 'auto' => ts('Auto'), + 'default' => ts('Default'), '0' => ts('Single client per case'), '1' => ts('Multiple client per case'), ); @@ -275,7 +275,7 @@ class CRM_Case_Info extends CRM_Core_Component_Info { */ public static function getSortOptions() { return array( - 'auto' => ts('Auto'), + 'default' => ts('Default'), '0' => ts('Definition order'), '1' => ts('Alphabetical order'), ); diff --git a/CRM/Case/XMLProcessor/Process.php b/CRM/Case/XMLProcessor/Process.php index 8f881a65ed..b230cdd928 100644 --- a/CRM/Case/XMLProcessor/Process.php +++ b/CRM/Case/XMLProcessor/Process.php @@ -635,7 +635,7 @@ AND a.is_deleted = 0 */ public function getRedactActivityEmail() { $setting = Civi::settings()->get('civicaseRedactActivityEmail'); - if ($setting !== 'auto') { + if ($setting !== 'default') { return (int) $setting; } $xml = $this->retrieve("Settings"); @@ -650,7 +650,7 @@ AND a.is_deleted = 0 */ public function getAllowMultipleCaseClients() { $setting = Civi::settings()->get('civicaseAllowMultipleCaseClients'); - if ($setting !== 'auto') { + if ($setting !== 'default') { return (int) $setting; } $xml = $this->retrieve("Settings"); @@ -668,7 +668,7 @@ AND a.is_deleted = 0 */ public function getNaturalActivityTypeSort() { $setting = Civi::settings()->get('civicaseNaturalActivityTypeSort'); - if ($setting !== 'auto') { + if ($setting !== 'default') { return (int) $setting; } $xml = $this->retrieve("Settings"); diff --git a/settings/Case.setting.php b/settings/Case.setting.php index aa0c011747..77f3b0f4b2 100644 --- a/settings/Case.setting.php +++ b/settings/Case.setting.php @@ -47,7 +47,7 @@ return array( 'html_attributes' => array( //'class' => 'crm-select2', ), - 'default' => 'auto', + 'default' => 'default', 'add' => '4.7', 'title' => 'Redact Activity Email', 'is_domain' => 1, @@ -55,7 +55,7 @@ return array( 'pseudoconstant' => array( 'callback' => 'CRM_Case_Info::getRedactOptions', ), - 'description' => 'Should activity emails be redacted? (Set "Auto" to load setting from the legacy "Settings.xml" file.)', + 'description' => 'Should activity emails be redacted? (Set "Default" to load setting from the legacy "Settings.xml" file.)', 'help_text' => '', ), 'civicaseAllowMultipleCaseClients' => array( @@ -68,7 +68,7 @@ return array( 'html_attributes' => array( //'class' => 'crm-select2', ), - 'default' => 'auto', + 'default' => 'default', 'add' => '4.7', 'title' => 'Allow Multiple Case Clients', 'is_domain' => 1, @@ -76,7 +76,7 @@ return array( 'pseudoconstant' => array( 'callback' => 'CRM_Case_Info::getMultiClientOptions', ), - 'description' => 'How many clients may be associated with a given case? (Set "Auto" to load setting from the legacy "Settings.xml" file.)', + 'description' => 'How many clients may be associated with a given case? (Set "Default" to load setting from the legacy "Settings.xml" file.)', 'help_text' => '', ), 'civicaseNaturalActivityTypeSort' => array( @@ -89,7 +89,7 @@ return array( 'html_attributes' => array( //'class' => 'crm-select2', ), - 'default' => 'auto', + 'default' => 'default', 'add' => '4.7', 'title' => 'Activity Type Sorting', 'is_domain' => 1, @@ -97,7 +97,7 @@ return array( 'pseudoconstant' => array( 'callback' => 'CRM_Case_Info::getSortOptions', ), - 'description' => 'How to sort activity-types on the "Manage Case" screen? (Set "Auto" to load setting from the legacy "Settings.xml" file.)', + 'description' => 'How to sort activity-types on the "Manage Case" screen? (Set "Default" to load setting from the legacy "Settings.xml" file.)', 'help_text' => '', ), ); diff --git a/templates/CRM/Admin/Form/Setting/Case.tpl b/templates/CRM/Admin/Form/Setting/Case.tpl index e8e81dc6f2..7da337b15d 100644 --- a/templates/CRM/Admin/Form/Setting/Case.tpl +++ b/templates/CRM/Admin/Form/Setting/Case.tpl @@ -32,19 +32,19 @@ {$form.civicaseRedactActivityEmail.label} {$form.civicaseRedactActivityEmail.html}
- {ts}Should activity emails be redacted?{/ts} {ts}(Set "Auto" to load setting from the legacy "Settings.xml" file.){/ts} + {ts}Should activity emails be redacted?{/ts} {ts}(Set "Default" to load setting from the legacy "Settings.xml" file.){/ts} {$form.civicaseAllowMultipleCaseClients.label} {$form.civicaseAllowMultipleCaseClients.html}
- {ts}How many clients may be associated with a given case?{/ts} {ts}(Set "Auto" to load setting from the legacy "Settings.xml" file.){/ts} + {ts}How many clients may be associated with a given case?{/ts} {ts}(Set "Default" to load setting from the legacy "Settings.xml" file.){/ts} {$form.civicaseNaturalActivityTypeSort.label} {$form.civicaseNaturalActivityTypeSort.html}
- {ts}How to sort activity-types on the "Manage Case" screen? {/ts} {ts}(Set "Auto" to load setting from the legacy "Settings.xml" file.){/ts} + {ts}How to sort activity-types on the "Manage Case" screen? {/ts} {ts}(Set "Default" to load setting from the legacy "Settings.xml" file.){/ts} -- 2.25.1