From e4de28436867f03c53108d930336bc2b778b7500 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 17 May 2023 12:42:50 -0700 Subject: [PATCH] (REF) CRM_Core_CodeGen_OptionGroup - Rename 'addValues($header, $rows)' to 'addValueTable($header, $rows)' --- CRM/Core/CodeGen/OptionGroup.php | 2 +- sql/civicrm_option_groups/accept_creditcard.sqldata.php | 2 +- sql/civicrm_option_groups/account_relationship.sqldata.php | 2 +- sql/civicrm_option_groups/acl_role.sqldata.php | 2 +- sql/civicrm_option_groups/activity_contacts.sqldata.php | 2 +- sql/civicrm_option_groups/activity_default_assignee.sqldata.php | 2 +- sql/civicrm_option_groups/activity_status.sqldata.php | 2 +- sql/civicrm_option_groups/activity_type.sqldata.php | 2 +- sql/civicrm_option_groups/address_options.sqldata.php | 2 +- sql/civicrm_option_groups/addressee.sqldata.php | 2 +- sql/civicrm_option_groups/advanced_search_options.sqldata.php | 2 +- sql/civicrm_option_groups/auto_renew_options.sqldata.php | 2 +- sql/civicrm_option_groups/batch_mode.sqldata.php | 2 +- sql/civicrm_option_groups/batch_status.sqldata.php | 2 +- sql/civicrm_option_groups/batch_type.sqldata.php | 2 +- sql/civicrm_option_groups/campaign_status.sqldata.php | 2 +- sql/civicrm_option_groups/campaign_type.sqldata.php | 2 +- sql/civicrm_option_groups/case_status.sqldata.php | 2 +- sql/civicrm_option_groups/cg_extend_objects.sqldata.php | 2 +- sql/civicrm_option_groups/communication_style.sqldata.php | 2 +- sql/civicrm_option_groups/conference_slot.sqldata.php | 2 +- .../contact_autocomplete_options.sqldata.php | 2 +- .../contact_date_reminder_options.sqldata.php | 2 +- sql/civicrm_option_groups/contact_edit_options.sqldata.php | 2 +- sql/civicrm_option_groups/contact_reference_options.sqldata.php | 2 +- .../contact_smart_group_display.sqldata.php | 2 +- sql/civicrm_option_groups/contact_view_options.sqldata.php | 2 +- sql/civicrm_option_groups/contribution_recur_status.sqldata.php | 2 +- sql/civicrm_option_groups/contribution_status.sqldata.php | 2 +- sql/civicrm_option_groups/currencies_enabled.sqldata.php | 2 +- sql/civicrm_option_groups/custom_data_type.sqldata.php | 2 +- sql/civicrm_option_groups/custom_search.sqldata.php | 2 +- sql/civicrm_option_groups/email_greeting.sqldata.php | 2 +- sql/civicrm_option_groups/encounter_medium.sqldata.php | 2 +- sql/civicrm_option_groups/engagement_index.sqldata.php | 2 +- sql/civicrm_option_groups/entity_batch_extends.sqldata.php | 2 +- sql/civicrm_option_groups/environment.sqldata.php | 2 +- sql/civicrm_option_groups/event_badge.sqldata.php | 2 +- sql/civicrm_option_groups/event_contacts.sqldata.php | 2 +- sql/civicrm_option_groups/event_type.sqldata.php | 2 +- sql/civicrm_option_groups/financial_account_type.sqldata.php | 2 +- sql/civicrm_option_groups/financial_item_status.sqldata.php | 2 +- sql/civicrm_option_groups/from_email_address.sqldata.php | 2 +- sql/civicrm_option_groups/gender.sqldata.php | 2 +- sql/civicrm_option_groups/group_type.sqldata.php | 2 +- sql/civicrm_option_groups/individual_prefix.sqldata.php | 2 +- sql/civicrm_option_groups/individual_suffix.sqldata.php | 2 +- sql/civicrm_option_groups/instant_messenger_service.sqldata.php | 2 +- sql/civicrm_option_groups/label_format.sqldata.php | 2 +- sql/civicrm_option_groups/label_type.sqldata.php | 2 +- sql/civicrm_option_groups/mail_approval_status.sqldata.php | 2 +- sql/civicrm_option_groups/mail_protocol.sqldata.php | 2 +- sql/civicrm_option_groups/mapping_type.sqldata.php | 2 +- sql/civicrm_option_groups/mobile_provider.sqldata.php | 2 +- sql/civicrm_option_groups/msg_mode.sqldata.php | 2 +- sql/civicrm_option_groups/name_badge.sqldata.php | 2 +- sql/civicrm_option_groups/note_privacy.sqldata.php | 2 +- sql/civicrm_option_groups/note_used_for.sqldata.php | 2 +- sql/civicrm_option_groups/paper_size.sqldata.php | 2 +- sql/civicrm_option_groups/participant_listing.sqldata.php | 2 +- sql/civicrm_option_groups/participant_role.sqldata.php | 2 +- sql/civicrm_option_groups/payment_instrument.sqldata.php | 2 +- sql/civicrm_option_groups/pcp_owner_notify.sqldata.php | 2 +- sql/civicrm_option_groups/pcp_status.sqldata.php | 2 +- sql/civicrm_option_groups/pdf_format.sqldata.php | 2 +- sql/civicrm_option_groups/phone_type.sqldata.php | 2 +- sql/civicrm_option_groups/pledge_status.sqldata.php | 2 +- sql/civicrm_option_groups/postal_greeting.sqldata.php | 2 +- .../preferred_communication_method.sqldata.php | 2 +- sql/civicrm_option_groups/priority.sqldata.php | 2 +- sql/civicrm_option_groups/recent_items_providers.sqldata.php | 2 +- sql/civicrm_option_groups/recur_frequency_units.sqldata.php | 2 +- sql/civicrm_option_groups/redaction_rule.sqldata.php | 2 +- sql/civicrm_option_groups/relative_date_filters.sqldata.php | 2 +- sql/civicrm_option_groups/report_template.sqldata.php | 2 +- sql/civicrm_option_groups/safe_file_extension.sqldata.php | 2 +- sql/civicrm_option_groups/sms_api_type.sqldata.php | 2 +- sql/civicrm_option_groups/soft_credit_type.sqldata.php | 2 +- sql/civicrm_option_groups/tag_used_for.sqldata.php | 2 +- sql/civicrm_option_groups/user_dashboard_options.sqldata.php | 2 +- sql/civicrm_option_groups/visibility.sqldata.php | 2 +- sql/civicrm_option_groups/website_type.sqldata.php | 2 +- sql/civicrm_option_groups/wysiwyg_editor.sqldata.php | 2 +- sql/civicrm_option_groups/wysiwyg_presets.sqldata.php | 2 +- 84 files changed, 84 insertions(+), 84 deletions(-) diff --git a/CRM/Core/CodeGen/OptionGroup.php b/CRM/Core/CodeGen/OptionGroup.php index ea1005d8e3..aa9c02cd94 100644 --- a/CRM/Core/CodeGen/OptionGroup.php +++ b/CRM/Core/CodeGen/OptionGroup.php @@ -84,7 +84,7 @@ class CRM_Core_CodeGen_OptionGroup { * * @return $this */ - public function addValues(array $header, array $optionValues) : CRM_Core_CodeGen_OptionGroup { + public function addValueTable(array $header, array $optionValues) : CRM_Core_CodeGen_OptionGroup { foreach ($optionValues as $optionValue) { $row = []; foreach ($optionValue as $key => $value) { diff --git a/sql/civicrm_option_groups/accept_creditcard.sqldata.php b/sql/civicrm_option_groups/accept_creditcard.sqldata.php index 283bb555b3..d086e8281d 100644 --- a/sql/civicrm_option_groups/accept_creditcard.sqldata.php +++ b/sql/civicrm_option_groups/accept_creditcard.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('accept_creditcard', 'a/0009') 'title' => ts('Accepted Credit Cards'), 'description' => ts('The following credit card options will be offered to contributors using Online Contribution pages. You will need to verify which cards are accepted by your chosen Payment Processor and update these entries accordingly.') . ts('IMPORTANT: These options do not control credit card/payment method choices for sites and/or contributors using the PayPal Express service (e.g. where billing information is collected on the Payment Processor\\\'s website).'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ ['Visa', 'Visa', 1], ['MasterCard', 'MasterCard', 2], ['Amex', 'Amex', 3], diff --git a/sql/civicrm_option_groups/account_relationship.sqldata.php b/sql/civicrm_option_groups/account_relationship.sqldata.php index 2b297ea9ad..025bccf29f 100644 --- a/sql/civicrm_option_groups/account_relationship.sqldata.php +++ b/sql/civicrm_option_groups/account_relationship.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('account_relationship', 'a/0061') ->addMetadata([ 'title' => ts('Account Relationship'), ]) - ->addValues(['label', 'name', 'value', 'description'], [ + ->addValueTable(['label', 'name', 'value', 'description'], [ // TODO: Shouldn't we have ts() for these descriptions? [ts('Income Account is'), 'Income Account is', 1, 'Income Account is', 'is_default' => 1], [ts('Credit/Contra Revenue Account is'), 'Credit/Contra Revenue Account is', 2, 'Credit/Contra Revenue Account is'], diff --git a/sql/civicrm_option_groups/acl_role.sqldata.php b/sql/civicrm_option_groups/acl_role.sqldata.php index 665979c68b..95a001290a 100644 --- a/sql/civicrm_option_groups/acl_role.sqldata.php +++ b/sql/civicrm_option_groups/acl_role.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('acl_role', 'a/0008') ->addMetadata([ 'title' => ts('ACL Role'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Administrator'), 'Admin', 1], [ts('Authenticated'), 'Auth', 2, 'is_reserved' => 1], ]); diff --git a/sql/civicrm_option_groups/activity_contacts.sqldata.php b/sql/civicrm_option_groups/activity_contacts.sqldata.php index 97db12f3d3..8b54ea5867 100644 --- a/sql/civicrm_option_groups/activity_contacts.sqldata.php +++ b/sql/civicrm_option_groups/activity_contacts.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('activity_contacts', 'a/0060') 'title' => ts('Activity Contacts'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value', 'weight'], [ + ->addValueTable(['label', 'name', 'value', 'weight'], [ [ts('Activity Assignees'), 'Activity Assignees', 1, 3], [ts('Activity Source'), 'Activity Source', 2, 2], [ts('Activity Targets'), 'Activity Targets', 3, 1], diff --git a/sql/civicrm_option_groups/activity_default_assignee.sqldata.php b/sql/civicrm_option_groups/activity_default_assignee.sqldata.php index a33e63108d..c9b6de29dd 100644 --- a/sql/civicrm_option_groups/activity_default_assignee.sqldata.php +++ b/sql/civicrm_option_groups/activity_default_assignee.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('activity_default_assignee', 'a/0082 ->addMetadata([ 'title' => ts('Activity default assignee'), ]) - ->addValues(['label', 'name', 'value', 'weight'], [ + ->addValueTable(['label', 'name', 'value', 'weight'], [ [ts('None'), 'NONE', 1, 1, 'is_default' => 1], [ts('By relationship to case client'), 'BY_RELATIONSHIP', 2, 1], [ts('Specific contact'), 'SPECIFIC_CONTACT', 3, 1], diff --git a/sql/civicrm_option_groups/activity_status.sqldata.php b/sql/civicrm_option_groups/activity_status.sqldata.php index 22c0c1b698..5f691bcc98 100644 --- a/sql/civicrm_option_groups/activity_status.sqldata.php +++ b/sql/civicrm_option_groups/activity_status.sqldata.php @@ -5,7 +5,7 @@ return CRM_Core_CodeGen_OptionGroup::create('activity_status', 'a/0024') 'data_type' => 'Integer', 'option_value_fields' => 'name,label,description,color', ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Scheduled'), 'Scheduled', 1, 'is_default' => 1, 'is_reserved' => 1], [ts('Completed'), 'Completed', 2, 'filter' => 1, 'is_reserved' => 1], [ts('Cancelled'), 'Cancelled', 3, 'filter' => 2, 'is_reserved' => 1], diff --git a/sql/civicrm_option_groups/activity_type.sqldata.php b/sql/civicrm_option_groups/activity_type.sqldata.php index 8de21bb274..afd079a430 100644 --- a/sql/civicrm_option_groups/activity_type.sqldata.php +++ b/sql/civicrm_option_groups/activity_type.sqldata.php @@ -7,7 +7,7 @@ return CRM_Core_CodeGen_OptionGroup::create('activity_type', 'a/0002') 'data_type' => 'Integer', 'option_value_fields' => 'name,label,description,icon', ]) - ->addValues(['label', 'name', 'value', 'weight'], [ + ->addValueTable(['label', 'name', 'value', 'weight'], [ [ts('Meeting'), 'Meeting', '1', '1', 'is_reserved' => '1', 'icon' => 'fa-slideshare'], [ts('Phone Call'), 'Phone Call', '2', '2', 'is_reserved' => '1', 'icon' => 'fa-phone'], [ts('Email'), 'Email', '3', '3', 'filter' => '1', 'description' => ts('Email sent.'), 'is_reserved' => '1', 'icon' => 'fa-envelope-o'], diff --git a/sql/civicrm_option_groups/address_options.sqldata.php b/sql/civicrm_option_groups/address_options.sqldata.php index ae230b0bad..6b83ffc229 100644 --- a/sql/civicrm_option_groups/address_options.sqldata.php +++ b/sql/civicrm_option_groups/address_options.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('address_options', 'a/0021') ->addMetadata([ 'title' => ts('Addressing Options'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Street Address'), 'street_address', 1], [ts('Supplemental Address 1'), 'supplemental_address_1', 2], [ts('Supplemental Address 2'), 'supplemental_address_2', 3], diff --git a/sql/civicrm_option_groups/addressee.sqldata.php b/sql/civicrm_option_groups/addressee.sqldata.php index 33eb2ca467..6cf090be50 100644 --- a/sql/civicrm_option_groups/addressee.sqldata.php +++ b/sql/civicrm_option_groups/addressee.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('addressee', 'a/0042') ->addMetadata([ 'title' => ts('Addressee Type'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ ['{contact.prefix_id:label}{ }{contact.first_name}{ }{contact.middle_name}{ }{contact.last_name}{ }{contact.suffix_id:label}', '{contact.prefix_id:label}{ }{contact.first_name}{ }{contact.middle_name}{ }{contact.last_name}{ }{contact.suffix_id:label}', 1, 'filter' => 1, 'is_default' => 1], ['{contact.household_name}', '{contact.household_name}', 2, 'filter' => 2, 'is_default' => 1], ['{contact.organization_name}', '{contact.organization_name}', 3, 'filter' => 3, 'is_default' => 1], diff --git a/sql/civicrm_option_groups/advanced_search_options.sqldata.php b/sql/civicrm_option_groups/advanced_search_options.sqldata.php index 5cf60799c7..534802718e 100644 --- a/sql/civicrm_option_groups/advanced_search_options.sqldata.php +++ b/sql/civicrm_option_groups/advanced_search_options.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('advanced_search_options', 'a/0019') 'title' => ts('Advanced Search Options'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value', 'weight'], [ + ->addValueTable(['label', 'name', 'value', 'weight'], [ [ts('Address Fields'), 'location', 1, 1], [ts('Custom Fields'), 'custom', 2, 2], [ts('Activities'), 'activity', 3, 4], diff --git a/sql/civicrm_option_groups/auto_renew_options.sqldata.php b/sql/civicrm_option_groups/auto_renew_options.sqldata.php index f6c5ccd974..68985a7184 100644 --- a/sql/civicrm_option_groups/auto_renew_options.sqldata.php +++ b/sql/civicrm_option_groups/auto_renew_options.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('auto_renew_options', 'a/0069') 'title' => ts('Auto Renew Options'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Renewal Reminder (non-auto-renew memberships only)'), 'Renewal Reminder (non-auto-renew memberships only)', 1], [ts('Auto-renew Memberships Only'), 'Auto-renew Memberships Only', 2], [ts('Reminder for Both'), 'Reminder for Both', 3], diff --git a/sql/civicrm_option_groups/batch_mode.sqldata.php b/sql/civicrm_option_groups/batch_mode.sqldata.php index 9270d33f1a..95f9d496ff 100644 --- a/sql/civicrm_option_groups/batch_mode.sqldata.php +++ b/sql/civicrm_option_groups/batch_mode.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('batch_mode', 'a/0065') 'title' => ts('Batch Mode'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value', 'description'], [ + ->addValueTable(['label', 'name', 'value', 'description'], [ // TODO: Shouldn't we have ts() for these descriptions? [ts('Manual Batch'), 'Manual Batch', 1, 'Manual Batch', 'is_reserved' => 1, 'component_id' => 2], [ts('Automatic Batch'), 'Automatic Batch', 2, 'Automatic Batch', 'is_reserved' => 1, 'component_id' => 2], diff --git a/sql/civicrm_option_groups/batch_status.sqldata.php b/sql/civicrm_option_groups/batch_status.sqldata.php index 2f5cd6cc71..61d1719b22 100644 --- a/sql/civicrm_option_groups/batch_status.sqldata.php +++ b/sql/civicrm_option_groups/batch_status.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('batch_status', 'a/0066') 'title' => ts('Batch Status'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Open'), 'Open', 1], [ts('Closed'), 'Closed', 2], [ts('Data Entry'), 'Data Entry', 3], diff --git a/sql/civicrm_option_groups/batch_type.sqldata.php b/sql/civicrm_option_groups/batch_type.sqldata.php index 3870705578..2278d1ee1b 100644 --- a/sql/civicrm_option_groups/batch_type.sqldata.php +++ b/sql/civicrm_option_groups/batch_type.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('batch_type', 'a/0064') 'title' => ts('Batch Type'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Contribution'), 'Contribution', 1], [ts('Membership'), 'Membership', 2], [ts('Pledge Payment'), 'Pledge Payment', 3], diff --git a/sql/civicrm_option_groups/campaign_status.sqldata.php b/sql/civicrm_option_groups/campaign_status.sqldata.php index 69a7789469..fe0e8e7d79 100644 --- a/sql/civicrm_option_groups/campaign_status.sqldata.php +++ b/sql/civicrm_option_groups/campaign_status.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('campaign_status', 'a/0052') ->addMetadata([ 'title' => ts('Campaign Status'), ]) - ->addValues(['label', 'name', 'value', 'weight'], [ + ->addValueTable(['label', 'name', 'value', 'weight'], [ [ts('Planned'), 'Planned', 1, 1], [ts('In Progress'), 'In Progress', 2, 1], [ts('Completed'), 'Completed', 3, 1], diff --git a/sql/civicrm_option_groups/campaign_type.sqldata.php b/sql/civicrm_option_groups/campaign_type.sqldata.php index 1272e6fbe9..c78c111757 100644 --- a/sql/civicrm_option_groups/campaign_type.sqldata.php +++ b/sql/civicrm_option_groups/campaign_type.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('campaign_type', 'a/0051') ->addMetadata([ 'title' => ts('Campaign Type'), ]) - ->addValues(['label', 'name', 'value', 'weight'], [ + ->addValueTable(['label', 'name', 'value', 'weight'], [ [ts('Direct Mail'), 'Direct Mail', 1, 1], [ts('Referral Program'), 'Referral Program', 2, 1], [ts('Constituent Engagement'), 'Constituent Engagement', 3, 1], diff --git a/sql/civicrm_option_groups/case_status.sqldata.php b/sql/civicrm_option_groups/case_status.sqldata.php index b22bf24cac..e9125de8bb 100644 --- a/sql/civicrm_option_groups/case_status.sqldata.php +++ b/sql/civicrm_option_groups/case_status.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('case_status', 'a/0026') 'title' => ts('Case Status'), 'option_value_fields' => 'name,label,description,color', ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Ongoing'), 'Open', 1, 'grouping' => 'Opened', 'is_default' => 1, 'is_reserved' => 1], [ts('Resolved'), 'Closed', 2, 'grouping' => 'Closed', 'is_reserved' => 1], [ts('Urgent'), 'Urgent', 3, 'grouping' => 'Opened'], diff --git a/sql/civicrm_option_groups/cg_extend_objects.sqldata.php b/sql/civicrm_option_groups/cg_extend_objects.sqldata.php index 7cc839b7e6..467688aaf5 100644 --- a/sql/civicrm_option_groups/cg_extend_objects.sqldata.php +++ b/sql/civicrm_option_groups/cg_extend_objects.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('cg_extend_objects', 'a/0056') ->addMetadata([ 'title' => ts('Objects a custom group extends to'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Survey'), 'civicrm_survey', 'Survey'], [ts('Cases'), 'civicrm_case', 'Case', 'grouping' => 'case_type_id'], ]); diff --git a/sql/civicrm_option_groups/communication_style.sqldata.php b/sql/civicrm_option_groups/communication_style.sqldata.php index 518a80b96e..c3de9f55f3 100644 --- a/sql/civicrm_option_groups/communication_style.sqldata.php +++ b/sql/civicrm_option_groups/communication_style.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('communication_style', 'a/0074') ->addMetadata([ 'title' => ts('Communication Style'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Formal'), 'formal', 1, 'is_default' => 1], [ts('Familiar'), 'familiar', 2], ]); diff --git a/sql/civicrm_option_groups/conference_slot.sqldata.php b/sql/civicrm_option_groups/conference_slot.sqldata.php index d9a0aab176..8748d52e4a 100644 --- a/sql/civicrm_option_groups/conference_slot.sqldata.php +++ b/sql/civicrm_option_groups/conference_slot.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('conference_slot', 'a/0063') ->addMetadata([ 'title' => ts('Conference Slot'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Morning Sessions'), 'Morning Sessions', 1], [ts('Evening Sessions'), 'Evening Sessions', 2], ]); diff --git a/sql/civicrm_option_groups/contact_autocomplete_options.sqldata.php b/sql/civicrm_option_groups/contact_autocomplete_options.sqldata.php index e6f91576da..e5ded1102a 100644 --- a/sql/civicrm_option_groups/contact_autocomplete_options.sqldata.php +++ b/sql/civicrm_option_groups/contact_autocomplete_options.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('contact_autocomplete_options', 'a/0 'title' => ts('Autocomplete Contact Search'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value', 'weight'], [ + ->addValueTable(['label', 'name', 'value', 'weight'], [ [ts('Email Address'), 'email', 2, 2], [ts('Phone'), 'phone', 3, 3], [ts('Street Address'), 'street_address', 4, 4], diff --git a/sql/civicrm_option_groups/contact_date_reminder_options.sqldata.php b/sql/civicrm_option_groups/contact_date_reminder_options.sqldata.php index 91596a4f39..888e0b6485 100644 --- a/sql/civicrm_option_groups/contact_date_reminder_options.sqldata.php +++ b/sql/civicrm_option_groups/contact_date_reminder_options.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('contact_date_reminder_options', 'a/ 'title' => ts('Contact Date Reminder Options'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Actual date only'), 'Actual date only', 1, 'is_reserved' => 1], [ts('Each anniversary'), 'Each anniversary', 2, 'is_reserved' => 1], ]) diff --git a/sql/civicrm_option_groups/contact_edit_options.sqldata.php b/sql/civicrm_option_groups/contact_edit_options.sqldata.php index 31a093510d..17d38f7306 100644 --- a/sql/civicrm_option_groups/contact_edit_options.sqldata.php +++ b/sql/civicrm_option_groups/contact_edit_options.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('contact_edit_options', 'a/0018') 'title' => ts('Contact Edit Options'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Custom Data'), 'CustomData', 1], [ts('Address'), 'Address', 2], [ts('Communication Preferences'), 'CommunicationPreferences', 3], diff --git a/sql/civicrm_option_groups/contact_reference_options.sqldata.php b/sql/civicrm_option_groups/contact_reference_options.sqldata.php index 61d6d57fcd..f5fe5e5c2a 100644 --- a/sql/civicrm_option_groups/contact_reference_options.sqldata.php +++ b/sql/civicrm_option_groups/contact_reference_options.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('contact_reference_options', 'a/0044 'title' => ts('Contact Reference Autocomplete Options'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value', 'weight'], [ + ->addValueTable(['label', 'name', 'value', 'weight'], [ [ts('Email Address'), 'email', 2, 2], [ts('Phone'), 'phone', 3, 3], [ts('Street Address'), 'street_address', 4, 4], diff --git a/sql/civicrm_option_groups/contact_smart_group_display.sqldata.php b/sql/civicrm_option_groups/contact_smart_group_display.sqldata.php index 2dca5718cb..59806a393a 100644 --- a/sql/civicrm_option_groups/contact_smart_group_display.sqldata.php +++ b/sql/civicrm_option_groups/contact_smart_group_display.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('contact_smart_group_display', 'a/00 'title' => ts('Contact Smart Group View Options'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Show Smart Groups on Demand'), 'showondemand', 1], [ts('Always Show Smart Groups'), 'alwaysshow', 2], [ts('Hide Smart Groups'), 'hide', 3], diff --git a/sql/civicrm_option_groups/contact_view_options.sqldata.php b/sql/civicrm_option_groups/contact_view_options.sqldata.php index 2e55bae7f4..2d0a9b333b 100644 --- a/sql/civicrm_option_groups/contact_view_options.sqldata.php +++ b/sql/civicrm_option_groups/contact_view_options.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('contact_view_options', 'a/0016') 'title' => ts('Contact View Options'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value', 'weight'], [ + ->addValueTable(['label', 'name', 'value', 'weight'], [ // NOTE: The original SQL had this inaccurate comment. It is unclear if the comment is inaccurate // because the situation changed for the better or the worse. diff --git a/sql/civicrm_option_groups/contribution_recur_status.sqldata.php b/sql/civicrm_option_groups/contribution_recur_status.sqldata.php index 350e820e47..e169ac1182 100644 --- a/sql/civicrm_option_groups/contribution_recur_status.sqldata.php +++ b/sql/civicrm_option_groups/contribution_recur_status.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('contribution_recur_status', 'a/0080 'title' => ts('Recurring Contribution Status'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Completed'), 'Completed', 1], [ts('Pending'), 'Pending', 2], [ts('Cancelled'), 'Cancelled', 3], diff --git a/sql/civicrm_option_groups/contribution_status.sqldata.php b/sql/civicrm_option_groups/contribution_status.sqldata.php index 66992800e1..7a2547f0a5 100644 --- a/sql/civicrm_option_groups/contribution_status.sqldata.php +++ b/sql/civicrm_option_groups/contribution_status.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('contribution_status', 'a/0011') 'title' => ts('Contribution Status'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value', 'weight'], [ + ->addValueTable(['label', 'name', 'value', 'weight'], [ [ts('Completed'), 'Completed', 1, 1, 'is_reserved' => 1], [ts('Pending'), 'Pending', 2, 2, 'is_reserved' => 1], [ts('Cancelled'), 'Cancelled', 3, 3, 'is_reserved' => 1], diff --git a/sql/civicrm_option_groups/currencies_enabled.sqldata.php b/sql/civicrm_option_groups/currencies_enabled.sqldata.php index d8f4caa646..1266d45502 100644 --- a/sql/civicrm_option_groups/currencies_enabled.sqldata.php +++ b/sql/civicrm_option_groups/currencies_enabled.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('currencies_enabled', 'a/0048') ->addMetadata([ 'title' => ts('Currencies Enabled'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ ['USD ($)', 'USD', 'USD', 'is_default' => 1], ['CAD ($)', 'CAD', 'CAD'], ['EUR (€)', 'EUR', 'EUR'], diff --git a/sql/civicrm_option_groups/custom_data_type.sqldata.php b/sql/civicrm_option_groups/custom_data_type.sqldata.php index 0417500343..1103cdd91f 100644 --- a/sql/civicrm_option_groups/custom_data_type.sqldata.php +++ b/sql/civicrm_option_groups/custom_data_type.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('custom_data_type', 'a/0034') ->addMetadata([ 'title' => ts('Custom Data Type'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Participants (Role)'), 'ParticipantRole', 1, 'grouping' => 'role_id'], [ts('Participants (Event Name)'), 'ParticipantEventName', 2, 'grouping' => 'event_id'], [ts('Participants (Event Type)'), 'ParticipantEventType', 3, 'grouping' => 'event_id.event_type_id'], diff --git a/sql/civicrm_option_groups/custom_search.sqldata.php b/sql/civicrm_option_groups/custom_search.sqldata.php index 69c4726460..0c4562fe1f 100644 --- a/sql/civicrm_option_groups/custom_search.sqldata.php +++ b/sql/civicrm_option_groups/custom_search.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('custom_search', 'a/0023') ->addMetadata([ 'title' => ts('Custom Search'), ]) - ->addValues(['label', 'name', 'value', 'weight', 'description'], [ + ->addValueTable(['label', 'name', 'value', 'weight', 'description'], [ ['CRM_Contact_Form_Search_Custom_Sample', 'CRM_Contact_Form_Search_Custom_Sample', 1, 1, ts('Household Name and State')], ['CRM_Contact_Form_Search_Custom_ContributionAggregate', 'CRM_Contact_Form_Search_Custom_ContributionAggregate', 2, 2, ts('Contribution Aggregate')], ['CRM_Contact_Form_Search_Custom_Group', 'CRM_Contact_Form_Search_Custom_Group', 4, 4, ts('Include / Exclude Search')], diff --git a/sql/civicrm_option_groups/email_greeting.sqldata.php b/sql/civicrm_option_groups/email_greeting.sqldata.php index 735d929c8e..299cc39a41 100644 --- a/sql/civicrm_option_groups/email_greeting.sqldata.php +++ b/sql/civicrm_option_groups/email_greeting.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('email_greeting', 'a/0040') ->addMetadata([ 'title' => ts('Email Greeting Type'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ ['Dear {contact.first_name}', 'Dear {contact.first_name}', 1, 'filter' => 1, 'is_default' => 1], ['Dear {contact.prefix_id:label} {contact.first_name} {contact.last_name}', 'Dear {contact.prefix_id:label} {contact.first_name} {contact.last_name}', 2, 'filter' => 1], ['Dear {contact.prefix_id:label} {contact.last_name}', 'Dear {contact.prefix_id:label} {contact.last_name}', 3, 'filter' => 1], diff --git a/sql/civicrm_option_groups/encounter_medium.sqldata.php b/sql/civicrm_option_groups/encounter_medium.sqldata.php index 2cdf5b6881..45ccf450c2 100644 --- a/sql/civicrm_option_groups/encounter_medium.sqldata.php +++ b/sql/civicrm_option_groups/encounter_medium.sqldata.php @@ -7,7 +7,7 @@ return CRM_Core_CodeGen_OptionGroup::create('encounter_medium', 'b/97') 'title' => 'Encounter Medium', 'description' => 'Encounter medium for case activities (e.g. In Person, By Phone, etc.)', ]) - ->addValues(['label', 'name'], [ + ->addValueTable(['label', 'name'], [ [ts('In Person'), 'in_person'], [ts('Phone'), 'phone', 'is_default' => 1], [ts('Email'), 'email'], diff --git a/sql/civicrm_option_groups/engagement_index.sqldata.php b/sql/civicrm_option_groups/engagement_index.sqldata.php index 4f5c5bd36a..617b04dffb 100644 --- a/sql/civicrm_option_groups/engagement_index.sqldata.php +++ b/sql/civicrm_option_groups/engagement_index.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('engagement_index', 'a/0055') ->addMetadata([ 'title' => ts('Engagement Index'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('1'), 1, 1], [ts('2'), 2, 2], [ts('3'), 3, 3], diff --git a/sql/civicrm_option_groups/entity_batch_extends.sqldata.php b/sql/civicrm_option_groups/entity_batch_extends.sqldata.php index bfed5b7850..55762609e6 100644 --- a/sql/civicrm_option_groups/entity_batch_extends.sqldata.php +++ b/sql/civicrm_option_groups/entity_batch_extends.sqldata.php @@ -3,6 +3,6 @@ return CRM_Core_CodeGen_OptionGroup::create('entity_batch_extends', 'a/0083') ->addMetadata([ 'title' => ts('Entity Batch Extends'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Financial Transactions'), 'civicrm_financial_trxn', 'civicrm_financial_trxn', 'is_default' => 1, 'component_id' => 2], ]); diff --git a/sql/civicrm_option_groups/environment.sqldata.php b/sql/civicrm_option_groups/environment.sqldata.php index 89d694ef29..97f5924426 100644 --- a/sql/civicrm_option_groups/environment.sqldata.php +++ b/sql/civicrm_option_groups/environment.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('environment', 'a/0081') ->addMetadata([ 'title' => ts('Environment'), ]) - ->addValues(['label', 'name', 'value', 'description'], [ + ->addValueTable(['label', 'name', 'value', 'description'], [ [ts('Production'), 'Production', 'Production', ts('Production Environment'), 'is_default' => 1], [ts('Staging'), 'Staging', 'Staging', ts('Staging Environment')], [ts('Development'), 'Development', 'Development', ts('Development Environment')], diff --git a/sql/civicrm_option_groups/event_badge.sqldata.php b/sql/civicrm_option_groups/event_badge.sqldata.php index d9bd482b37..48112c145a 100644 --- a/sql/civicrm_option_groups/event_badge.sqldata.php +++ b/sql/civicrm_option_groups/event_badge.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('event_badge', 'a/0049') ->addMetadata([ 'title' => ts('Event Name Badge'), ]) - ->addValues(['label', 'name', 'value', 'description'], [ + ->addValueTable(['label', 'name', 'value', 'description'], [ [ts('Name Only'), 'CRM_Event_Badge_Simple', 1, ts('Simple Event Name Badge'), 'is_reserved' => 1], [ts('Name Tent'), 'CRM_Event_Badge_NameTent', 2, ts('Name Tent'), 'is_reserved' => 1], [ts('With Logo'), 'CRM_Event_Badge_Logo', 3, ts('You can set your own background image'), 'is_reserved' => 1], diff --git a/sql/civicrm_option_groups/event_contacts.sqldata.php b/sql/civicrm_option_groups/event_contacts.sqldata.php index 1671b398ba..db40a2f9d4 100644 --- a/sql/civicrm_option_groups/event_contacts.sqldata.php +++ b/sql/civicrm_option_groups/event_contacts.sqldata.php @@ -3,6 +3,6 @@ return CRM_Core_CodeGen_OptionGroup::create('event_contacts', 'a/0062') ->addMetadata([ 'title' => ts('Event Recipients'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Participant Role'), 'participant_role', 1], ]); diff --git a/sql/civicrm_option_groups/event_type.sqldata.php b/sql/civicrm_option_groups/event_type.sqldata.php index 5d105ac525..71bc521a39 100644 --- a/sql/civicrm_option_groups/event_type.sqldata.php +++ b/sql/civicrm_option_groups/event_type.sqldata.php @@ -5,7 +5,7 @@ return CRM_Core_CodeGen_OptionGroup::create('event_type', 'a/0015') 'description' => ts('Use Event Types to categorize your events. Event feeds can be filtered by Event Type and participant searches can use Event Type as a criteria.'), 'data_type' => 'Integer', ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Conference'), 'Conference', 1], [ts('Exhibition'), 'Exhibition', 2], [ts('Fundraiser'), 'Fundraiser', 3], diff --git a/sql/civicrm_option_groups/financial_account_type.sqldata.php b/sql/civicrm_option_groups/financial_account_type.sqldata.php index abbff8a415..5e36e6a4b4 100644 --- a/sql/civicrm_option_groups/financial_account_type.sqldata.php +++ b/sql/civicrm_option_groups/financial_account_type.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('financial_account_type', 'a/0070') ->addMetadata([ 'title' => ts('Financial Account Type'), ]) - ->addValues(['label', 'name', 'value', 'description'], [ + ->addValueTable(['label', 'name', 'value', 'description'], [ [ts('Asset'), 'Asset', 1, ts('Things you own'), 'is_reserved' => 1, 'component_id' => 2], [ts('Liability'), 'Liability', 2, ts('Things you owe, like a grant still to be disbursed'), 'is_reserved' => 1, 'component_id' => 2], [ts('Revenue'), 'Revenue', 3, ts('Income from contributions and sales of tickets and memberships'), 'is_default' => 1, 'is_reserved' => 1, 'component_id' => 2], diff --git a/sql/civicrm_option_groups/financial_item_status.sqldata.php b/sql/civicrm_option_groups/financial_item_status.sqldata.php index 585997bcc6..387900e345 100644 --- a/sql/civicrm_option_groups/financial_item_status.sqldata.php +++ b/sql/civicrm_option_groups/financial_item_status.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('financial_item_status', 'a/0071') 'title' => ts('Financial Item Status'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value', 'weight', 'description'], [ + ->addValueTable(['label', 'name', 'value', 'weight', 'description'], [ // TODO: Shouldn't we have ts() for these descriptions? [ts('Paid'), 'Paid', 1, 1, 'Paid', 'is_reserved' => 1, 'component_id' => 2], [ts('Unpaid'), 'Unpaid', 3, 1, 'Unpaid', 'is_reserved' => 1, 'component_id' => 2], diff --git a/sql/civicrm_option_groups/from_email_address.sqldata.php b/sql/civicrm_option_groups/from_email_address.sqldata.php index 380a8c6aaa..28be1a8f36 100644 --- a/sql/civicrm_option_groups/from_email_address.sqldata.php +++ b/sql/civicrm_option_groups/from_email_address.sqldata.php @@ -4,6 +4,6 @@ return CRM_Core_CodeGen_OptionGroup::create('from_email_address', 'a/0029') 'title' => ts('From Email Address'), 'description' => ts('By default, CiviCRM uses the primary email address of the logged in user as the FROM address when sending emails to contacts. However, you can use this page to define one or more general Email Addresses that can be selected as an alternative. EXAMPLE: "Client Services" .'), ]) - ->addValues(['label', 'name', 'value', 'description'], [ + ->addValueTable(['label', 'name', 'value', 'description'], [ ['"FIXME" ', '"FIXME" ', 1, ts('Default domain email address and from name.'), 'is_default' => 1, 'domain_id' => new CRM_Utils_SQL_Literal('@domainID')], ]); diff --git a/sql/civicrm_option_groups/gender.sqldata.php b/sql/civicrm_option_groups/gender.sqldata.php index ca07e6a778..ec2456ed89 100644 --- a/sql/civicrm_option_groups/gender.sqldata.php +++ b/sql/civicrm_option_groups/gender.sqldata.php @@ -5,7 +5,7 @@ return CRM_Core_CodeGen_OptionGroup::create('gender', 'a/0003') 'description' => ts('CiviCRM is pre-configured with standard options for individual gender (Male, Female, Other). Modify these options as needed for your installation.'), 'data_type' => 'Integer', ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Female'), 'Female', 1], [ts('Male'), 'Male', 2], [ts('Other'), 'Other', 3], diff --git a/sql/civicrm_option_groups/group_type.sqldata.php b/sql/civicrm_option_groups/group_type.sqldata.php index fb67a909f4..427d7aa5b2 100644 --- a/sql/civicrm_option_groups/group_type.sqldata.php +++ b/sql/civicrm_option_groups/group_type.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('group_type', 'a/0022') ->addMetadata([ 'title' => ts('Group Type'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Access Control'), 'Access Control', 1, 'is_reserved' => 1], [ts('Mailing List'), 'Mailing List', 2, 'is_reserved' => 1], ]); diff --git a/sql/civicrm_option_groups/individual_prefix.sqldata.php b/sql/civicrm_option_groups/individual_prefix.sqldata.php index 857054c4be..492db508c6 100644 --- a/sql/civicrm_option_groups/individual_prefix.sqldata.php +++ b/sql/civicrm_option_groups/individual_prefix.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('individual_prefix', 'a/0006') 'title' => ts('Individual contact prefixes'), 'description' => ts('CiviCRM is pre-configured with standard options for individual contact prefixes (Ms., Mr., Dr. etc.). Customize these options and add new ones as needed for your installation.'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Mrs.'), 'Mrs.', 1], [ts('Ms.'), 'Ms.', 2], [ts('Mr.'), 'Mr.', 3], diff --git a/sql/civicrm_option_groups/individual_suffix.sqldata.php b/sql/civicrm_option_groups/individual_suffix.sqldata.php index 916c194433..6ff347dc13 100644 --- a/sql/civicrm_option_groups/individual_suffix.sqldata.php +++ b/sql/civicrm_option_groups/individual_suffix.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('individual_suffix', 'a/0007') 'title' => ts('Individual contact suffixes'), 'description' => ts('CiviCRM is pre-configured with standard options for individual contact name suffixes (Jr., Sr., II etc.). Customize these options and add new ones as needed for your installation.'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Jr.'), 'Jr.', 1], [ts('Sr.'), 'Sr.', 2], ['II', 'II', 3], diff --git a/sql/civicrm_option_groups/instant_messenger_service.sqldata.php b/sql/civicrm_option_groups/instant_messenger_service.sqldata.php index ded0d7b0b8..676c75006c 100644 --- a/sql/civicrm_option_groups/instant_messenger_service.sqldata.php +++ b/sql/civicrm_option_groups/instant_messenger_service.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('instant_messenger_service', 'a/0004 'title' => ts('Instant Messenger (IM) screen-names'), 'description' => ts('Commonly-used messaging apps are listed here. Administrators may define as many additional providers as needed.'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ ['Yahoo', 'Yahoo', 1], ['MSN', 'Msn', 2], ['AIM', 'Aim', 3], diff --git a/sql/civicrm_option_groups/label_format.sqldata.php b/sql/civicrm_option_groups/label_format.sqldata.php index 75922aed13..d1f8c7fb67 100644 --- a/sql/civicrm_option_groups/label_format.sqldata.php +++ b/sql/civicrm_option_groups/label_format.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('label_format', 'a/0059') ->addMetadata([ 'title' => ts('Mailing Label Format'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Avery 3475'), 3475, '{"paper-size":"a4","orientation":"portrait","font-name":"dejavusans","font-size":10,"font-style":"","metric":"mm","lMargin":0,"tMargin":5,"NX":3,"NY":8,"SpaceX":0,"SpaceY":0,"width":70,"height":36,"lPadding":5.08,"tPadding":5.08}', 'grouping' => 'Avery', 'is_reserved' => 1], [ts('Avery 5160'), 5160, '{"paper-size":"letter","orientation":"portrait","font-name":"dejavusans","font-size":8,"font-style":"","metric":"in","lMargin":0.21975,"tMargin":0.5,"NX":3,"NY":10,"SpaceX":0.14,"SpaceY":0,"width":2.5935,"height":1,"lPadding":0.20,"tPadding":0.20}', 'grouping' => 'Avery', 'is_reserved' => 1], [ts('Avery 5161'), 5161, '{"paper-size":"letter","orientation":"portrait","font-name":"dejavusans","font-size":8,"font-style":"","metric":"in","lMargin":0.175,"tMargin":0.5,"NX":2,"NY":10,"SpaceX":0.15625,"SpaceY":0,"width":4,"height":1,"lPadding":0.20,"tPadding":0.20}', 'grouping' => 'Avery', 'is_reserved' => 1], diff --git a/sql/civicrm_option_groups/label_type.sqldata.php b/sql/civicrm_option_groups/label_type.sqldata.php index 7ede3ba723..4d252087d5 100644 --- a/sql/civicrm_option_groups/label_type.sqldata.php +++ b/sql/civicrm_option_groups/label_type.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('label_type', 'a/0072') ->addMetadata([ 'title' => ts('Label Type'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Event Badge'), 'Event Badge', 1], ]) ->addDefaults([ diff --git a/sql/civicrm_option_groups/mail_approval_status.sqldata.php b/sql/civicrm_option_groups/mail_approval_status.sqldata.php index 2f13324033..1b6ff70fea 100644 --- a/sql/civicrm_option_groups/mail_approval_status.sqldata.php +++ b/sql/civicrm_option_groups/mail_approval_status.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('mail_approval_status', 'a/0054') ->addMetadata([ 'title' => ts('CiviMail Approval Status'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Approved'), 'Approved', 1, 'is_default' => 1, 'is_reserved' => 1, 'component_id' => 4, 'domain_id' => 1], [ts('Rejected'), 'Rejected', 2, 'is_reserved' => 1, 'component_id' => 4, 'domain_id' => 1], [ts('None'), 'None', 3, 'is_reserved' => 1, 'component_id' => 4, 'domain_id' => 1], diff --git a/sql/civicrm_option_groups/mail_protocol.sqldata.php b/sql/civicrm_option_groups/mail_protocol.sqldata.php index 71b58f1db7..5bcd96f131 100644 --- a/sql/civicrm_option_groups/mail_protocol.sqldata.php +++ b/sql/civicrm_option_groups/mail_protocol.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('mail_protocol', 'a/0036') ->addMetadata([ 'title' => ts('Mail Protocol'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ ['IMAP', 'IMAP', 1], ['Maildir', 'Maildir', 2], ['POP3', 'POP3', 3], diff --git a/sql/civicrm_option_groups/mapping_type.sqldata.php b/sql/civicrm_option_groups/mapping_type.sqldata.php index 035936fb14..68614993aa 100644 --- a/sql/civicrm_option_groups/mapping_type.sqldata.php +++ b/sql/civicrm_option_groups/mapping_type.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('mapping_type', 'a/0030') 'title' => ts('Mapping Type'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value', 'weight'], [ + ->addValueTable(['label', 'name', 'value', 'weight'], [ [ts('Search Builder'), 'Search Builder', 1, 1, 'is_reserved' => 1], [ts('Import Contact'), 'Import Contact', 2, 2, 'is_reserved' => 1], [ts('Import Activity'), 'Import Activity', 3, 3, 'is_reserved' => 1], diff --git a/sql/civicrm_option_groups/mobile_provider.sqldata.php b/sql/civicrm_option_groups/mobile_provider.sqldata.php index 953bfbe97e..5415535868 100644 --- a/sql/civicrm_option_groups/mobile_provider.sqldata.php +++ b/sql/civicrm_option_groups/mobile_provider.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('mobile_provider', 'a/0005') 'title' => ts('Mobile Phone Providers'), 'description' => ts('When recording mobile phone numbers for contacts, it may be useful to include the Mobile Phone Service Provider (e.g. Cingular, Sprint, etc.). CiviCRM is installed with the most commonly encountered service providers. Administrators may define as many additional providers as needed.'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ ['Sprint', 'Sprint', 1], ['Verizon', 'Verizon', 2], ['Cingular', 'Cingular', 3], diff --git a/sql/civicrm_option_groups/msg_mode.sqldata.php b/sql/civicrm_option_groups/msg_mode.sqldata.php index 1b9ebcf773..f302cb3653 100644 --- a/sql/civicrm_option_groups/msg_mode.sqldata.php +++ b/sql/civicrm_option_groups/msg_mode.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('msg_mode', 'a/0075') ->addMetadata([ 'title' => ts('Message Mode'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Email'), 'Email', 'Email', 'is_default' => 1, 'is_reserved' => 1], [ts('SMS'), 'SMS', 'SMS', 'is_reserved' => 1], [ts('User Preference'), 'User Preference', 'User_Preference', 'is_reserved' => 1], diff --git a/sql/civicrm_option_groups/name_badge.sqldata.php b/sql/civicrm_option_groups/name_badge.sqldata.php index a1abcdbf54..2c92b8c681 100644 --- a/sql/civicrm_option_groups/name_badge.sqldata.php +++ b/sql/civicrm_option_groups/name_badge.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('name_badge', 'a/0073') ->addMetadata([ 'title' => ts('Name Badge Format'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Avery 5395'), 'Avery 5395', '{"name":"Avery 5395","paper-size":"a4","metric":"mm","lMargin":15,"tMargin":26,"NX":2,"NY":4,"SpaceX":10,"SpaceY":5,"width":83,"height":57,"font-size":12,"orientation":"portrait","font-name":"helvetica","font-style":"","lPadding":3,"tPadding":3}'], [ts('A6 Badge Portrait 150x106'), 'A6 Badge Portrait 150x106', '{"paper-size":"a4","orientation":"landscape","font-name":"times","font-size":6,"font-style":"","NX":2,"NY":1,"metric":"mm","lMargin":25,"tMargin":27,"SpaceX":0,"SpaceY":35,"width":106,"height":150,"lPadding":5,"tPadding":5}'], [ts('Fattorini Name Badge 100x65'), 'Fattorini Name Badge 100x65', '{"paper-size":"a4","orientation":"portrait","font-name":"times","font-size":6,"font-style":"","NX":2,"NY":4,"metric":"mm","lMargin":6,"tMargin":19,"SpaceX":0,"SpaceY":0,"width":100,"height":65,"lPadding":0,"tPadding":0}'], diff --git a/sql/civicrm_option_groups/note_privacy.sqldata.php b/sql/civicrm_option_groups/note_privacy.sqldata.php index 82c1ae75d5..2588f68e43 100644 --- a/sql/civicrm_option_groups/note_privacy.sqldata.php +++ b/sql/civicrm_option_groups/note_privacy.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('note_privacy', 'a/0050') ->addMetadata([ 'title' => ts('Privacy levels for notes'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('None'), 'None', 0, 'is_default' => 1, 'is_reserved' => 1], [ts('Author Only'), 'Author Only', 1, 'is_reserved' => 1], ]); diff --git a/sql/civicrm_option_groups/note_used_for.sqldata.php b/sql/civicrm_option_groups/note_used_for.sqldata.php index 880a230967..a3ed714dcc 100644 --- a/sql/civicrm_option_groups/note_used_for.sqldata.php +++ b/sql/civicrm_option_groups/note_used_for.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('note_used_for', 'a/0047') 'title' => ts('Note Used For'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Contacts'), 'Contact', 'civicrm_contact'], [ts('Relationships'), 'Relationship', 'civicrm_relationship'], [ts('Participants'), 'Participant', 'civicrm_participant'], diff --git a/sql/civicrm_option_groups/paper_size.sqldata.php b/sql/civicrm_option_groups/paper_size.sqldata.php index fd942ecb42..41ca44ad09 100644 --- a/sql/civicrm_option_groups/paper_size.sqldata.php +++ b/sql/civicrm_option_groups/paper_size.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('paper_size', 'a/0057') ->addMetadata([ 'title' => ts('Paper Size'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Letter'), 'letter', '{"metric":"in","width":8.5,"height":11}', 'is_default' => 1], [ts('Legal'), 'legal', '{"metric":"in","width":8.5,"height":14}'], [ts('Ledger'), 'ledger', '{"metric":"in","width":17,"height":11}'], diff --git a/sql/civicrm_option_groups/participant_listing.sqldata.php b/sql/civicrm_option_groups/participant_listing.sqldata.php index 1b546edb9b..884e8bb3a6 100644 --- a/sql/civicrm_option_groups/participant_listing.sqldata.php +++ b/sql/civicrm_option_groups/participant_listing.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('participant_listing', 'a/0027') ->addMetadata([ 'title' => ts('Participant Listing'), ]) - ->addValues(['label', 'name', 'value', 'description'], [ + ->addValueTable(['label', 'name', 'value', 'description'], [ [ts('Name Only'), 'Name Only', 1, ts('CRM_Event_Page_ParticipantListing_Name'), 'is_reserved' => 1], [ts('Name and Email'), 'Name and Email', 2, ts('CRM_Event_Page_ParticipantListing_NameAndEmail'), 'is_reserved' => 1], [ts('Name, Status and Register Date'), 'Name, Status and Register Date', 3, ts('CRM_Event_Page_ParticipantListing_NameStatusAndDate'), 'is_reserved' => 1], diff --git a/sql/civicrm_option_groups/participant_role.sqldata.php b/sql/civicrm_option_groups/participant_role.sqldata.php index a0ee672f3a..a057a6d7fc 100644 --- a/sql/civicrm_option_groups/participant_role.sqldata.php +++ b/sql/civicrm_option_groups/participant_role.sqldata.php @@ -5,7 +5,7 @@ return CRM_Core_CodeGen_OptionGroup::create('participant_role', 'a/0014') 'description' => ts('Define participant roles for events here (e.g. Attendee, Host, Speaker...). You can then assign roles and search for participants by role.'), 'data_type' => 'Integer', ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Attendee'), 'Attendee', 1, 'filter' => 1], [ts('Volunteer'), 'Volunteer', 2, 'filter' => 1], [ts('Host'), 'Host', 3, 'filter' => 1], diff --git a/sql/civicrm_option_groups/payment_instrument.sqldata.php b/sql/civicrm_option_groups/payment_instrument.sqldata.php index 138a3c9f67..90aec10c11 100644 --- a/sql/civicrm_option_groups/payment_instrument.sqldata.php +++ b/sql/civicrm_option_groups/payment_instrument.sqldata.php @@ -5,7 +5,7 @@ return CRM_Core_CodeGen_OptionGroup::create('payment_instrument', 'a/0010') 'description' => ts('You may choose to record the payment method used for each contribution and fee. Reserved payment methods are required - you may modify their labels but they can not be deleted (e.g. Check, Credit Card, Debit Card). If your site requires additional payment methods, you can add them here. You can associate each payment method with a Financial Account which specifies where the payment is going (e.g. a bank account for checks and cash).'), 'data_type' => 'Integer', ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Credit Card'), 'Credit Card', 1, 'is_reserved' => 1], [ts('Debit Card'), 'Debit Card', 2, 'is_reserved' => 1], [ts('Cash'), 'Cash', 3], diff --git a/sql/civicrm_option_groups/pcp_owner_notify.sqldata.php b/sql/civicrm_option_groups/pcp_owner_notify.sqldata.php index 8e046e8df0..51e775a242 100644 --- a/sql/civicrm_option_groups/pcp_owner_notify.sqldata.php +++ b/sql/civicrm_option_groups/pcp_owner_notify.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('pcp_owner_notify', 'a/0013') 'title' => ts('PCP owner notifications'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Owner chooses whether to receive notifications'), 'owner_chooses', 1, 'is_default' => 1, 'is_reserved' => 1], [ts('Notifications are sent to ALL owners'), 'all_owners', 2, 'is_reserved' => 1], [ts('Notifications are NOT available'), 'no_notifications', 3, 'is_reserved' => 1], diff --git a/sql/civicrm_option_groups/pcp_status.sqldata.php b/sql/civicrm_option_groups/pcp_status.sqldata.php index ae0ffc8e89..d4987729c9 100644 --- a/sql/civicrm_option_groups/pcp_status.sqldata.php +++ b/sql/civicrm_option_groups/pcp_status.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('pcp_status', 'a/0012') 'title' => ts('PCP Status'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Waiting Review'), 'Waiting Review', 1, 'is_reserved' => 1], [ts('Approved'), 'Approved', 2, 'is_reserved' => 1], [ts('Not Approved'), 'Not Approved', 3, 'is_reserved' => 1], diff --git a/sql/civicrm_option_groups/pdf_format.sqldata.php b/sql/civicrm_option_groups/pdf_format.sqldata.php index c227f8ee97..6a8ea92b8a 100644 --- a/sql/civicrm_option_groups/pdf_format.sqldata.php +++ b/sql/civicrm_option_groups/pdf_format.sqldata.php @@ -3,6 +3,6 @@ return CRM_Core_CodeGen_OptionGroup::create('pdf_format', 'a/0058') ->addMetadata([ 'title' => ts('PDF Page Format'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Invoice PDF Format'), 'default_invoice_pdf_format', '{"metric":"px","margin_top":10,"margin_bottom":0,"margin_left":65,"margin_right":0}', 'is_reserved' => 1], ]); diff --git a/sql/civicrm_option_groups/phone_type.sqldata.php b/sql/civicrm_option_groups/phone_type.sqldata.php index 70518a2a68..cfa0b66429 100644 --- a/sql/civicrm_option_groups/phone_type.sqldata.php +++ b/sql/civicrm_option_groups/phone_type.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('phone_type', 'a/0033') ->addMetadata([ 'title' => ts('Phone Type'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Phone'), 'Phone', 1], [ts('Mobile'), 'Mobile', 2], [ts('Fax'), 'Fax', 3], diff --git a/sql/civicrm_option_groups/pledge_status.sqldata.php b/sql/civicrm_option_groups/pledge_status.sqldata.php index 056490bb47..8944d56cac 100644 --- a/sql/civicrm_option_groups/pledge_status.sqldata.php +++ b/sql/civicrm_option_groups/pledge_status.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('pledge_status', 'a/0079') 'title' => ts('Pledge Status'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Completed'), 'Completed', 1, 'is_reserved' => 1], [ts('Pending'), 'Pending', 2, 'is_reserved' => 1], [ts('Cancelled'), 'Cancelled', 3, 'is_reserved' => 1], diff --git a/sql/civicrm_option_groups/postal_greeting.sqldata.php b/sql/civicrm_option_groups/postal_greeting.sqldata.php index 70f53fd51f..a02604cb5c 100644 --- a/sql/civicrm_option_groups/postal_greeting.sqldata.php +++ b/sql/civicrm_option_groups/postal_greeting.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('postal_greeting', 'a/0041') ->addMetadata([ 'title' => ts('Postal Greeting Type'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ ['Dear {contact.first_name}', 'Dear {contact.first_name}', 1, 'filter' => 1, 'is_default' => 1], ['Dear {contact.prefix_id:label} {contact.first_name} {contact.last_name}', 'Dear {contact.prefix_id:label} {contact.first_name} {contact.last_name}', 2, 'filter' => 1], ['Dear {contact.prefix_id:label} {contact.last_name}', 'Dear {contact.prefix_id:label} {contact.last_name}', 3, 'filter' => 1], diff --git a/sql/civicrm_option_groups/preferred_communication_method.sqldata.php b/sql/civicrm_option_groups/preferred_communication_method.sqldata.php index 83971e053b..fb2511ece9 100644 --- a/sql/civicrm_option_groups/preferred_communication_method.sqldata.php +++ b/sql/civicrm_option_groups/preferred_communication_method.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('preferred_communication_method', 'a ->addMetadata([ 'title' => ts('Preferred Communication Method'), ]) - ->addValues(['label', 'name'], [ + ->addValueTable(['label', 'name'], [ [ts('Phone'), 'Phone'], [ts('Email'), 'Email'], [ts('Postal Mail'), 'Postal Mail'], diff --git a/sql/civicrm_option_groups/priority.sqldata.php b/sql/civicrm_option_groups/priority.sqldata.php index b5cfdb1140..3733464ad7 100644 --- a/sql/civicrm_option_groups/priority.sqldata.php +++ b/sql/civicrm_option_groups/priority.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('priority', 'a/0037') ->addMetadata([ 'title' => ts('Priority'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Urgent'), 'Urgent', 1], [ts('Normal'), 'Normal', 2], [ts('Low'), 'Low', 3], diff --git a/sql/civicrm_option_groups/recent_items_providers.sqldata.php b/sql/civicrm_option_groups/recent_items_providers.sqldata.php index f699c002f4..e20fc22cd0 100644 --- a/sql/civicrm_option_groups/recent_items_providers.sqldata.php +++ b/sql/civicrm_option_groups/recent_items_providers.sqldata.php @@ -5,7 +5,7 @@ return CRM_Core_CodeGen_OptionGroup::create('recent_items_providers', 'b/99') ->addMetadata([ 'title' => ts('Recent Items Providers'), ]) - ->addValues(['label', 'value', 'name'], [ + ->addValueTable(['label', 'value', 'name'], [ [ts('Contacts'), 'Contact', 'Contact'], [ts('Relationships'), 'Relationship', 'Relationship'], [ts('Activities'), 'Activity', 'Activity'], diff --git a/sql/civicrm_option_groups/recur_frequency_units.sqldata.php b/sql/civicrm_option_groups/recur_frequency_units.sqldata.php index 1f0ca9b05f..2df573dbb8 100644 --- a/sql/civicrm_option_groups/recur_frequency_units.sqldata.php +++ b/sql/civicrm_option_groups/recur_frequency_units.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('recur_frequency_units', 'a/0032') ->addMetadata([ 'title' => ts('Recurring Frequency Units'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('day'), 'day', 'day', 'is_reserved' => 1], [ts('week'), 'week', 'week', 'is_reserved' => 1], [ts('month'), 'month', 'month', 'is_reserved' => 1], diff --git a/sql/civicrm_option_groups/redaction_rule.sqldata.php b/sql/civicrm_option_groups/redaction_rule.sqldata.php index 205f833dcb..be2de65c0a 100644 --- a/sql/civicrm_option_groups/redaction_rule.sqldata.php +++ b/sql/civicrm_option_groups/redaction_rule.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('redaction_rule', 'a/0038') ->addMetadata([ 'title' => ts('Redaction Rule'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ ['Vancouver', 'city_', 'city_', 'is_active' => 0], ['/(19|20)(\\d{2})-(\\d{1,2})-(\\d{1,2})/', 'date_', 'date_', 'filter' => 1, 'is_active' => 0], ]); diff --git a/sql/civicrm_option_groups/relative_date_filters.sqldata.php b/sql/civicrm_option_groups/relative_date_filters.sqldata.php index 0f6c6ee8c8..569d227f0d 100644 --- a/sql/civicrm_option_groups/relative_date_filters.sqldata.php +++ b/sql/civicrm_option_groups/relative_date_filters.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('relative_date_filters', 'a/0078') ->addMetadata([ 'title' => ts('Relative Date Filters'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Today'), 'this.day', 'this.day'], [ts('This week'), 'this.week', 'this.week'], [ts('This calendar month'), 'this.month', 'this.month'], diff --git a/sql/civicrm_option_groups/report_template.sqldata.php b/sql/civicrm_option_groups/report_template.sqldata.php index a638bed946..2b96a56a02 100644 --- a/sql/civicrm_option_groups/report_template.sqldata.php +++ b/sql/civicrm_option_groups/report_template.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('report_template', 'a/0039') ->addMetadata([ 'title' => ts('Report Template'), ]) - ->addValues(['label', 'name', 'value', 'weight', 'description'], [ + ->addValueTable(['label', 'name', 'value', 'weight', 'description'], [ [ts('Constituent Report (Summary)'), 'CRM_Report_Form_Contact_Summary', 'contact/summary', 1, ts('Provides a list of address and telephone information for constituent records in your system.')], [ts('Constituent Report (Detail)'), 'CRM_Report_Form_Contact_Detail', 'contact/detail', 2, ts('Provides contact-related information on contributions, memberships, events and activities.')], [ts('Activity Details Report'), 'CRM_Report_Form_Activity', 'activity', 3, ts('Provides a list of constituent activity including activity statistics for one/all contacts during a given date range(required)')], diff --git a/sql/civicrm_option_groups/safe_file_extension.sqldata.php b/sql/civicrm_option_groups/safe_file_extension.sqldata.php index bf04c0e314..01ebaa3689 100644 --- a/sql/civicrm_option_groups/safe_file_extension.sqldata.php +++ b/sql/civicrm_option_groups/safe_file_extension.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('safe_file_extension', 'a/0028') ->addMetadata([ 'title' => ts('Safe File Extension'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ ['jpg', 'jpg', 1], ['jpeg', 'jpeg', 2], ['png', 'png', 3], diff --git a/sql/civicrm_option_groups/sms_api_type.sqldata.php b/sql/civicrm_option_groups/sms_api_type.sqldata.php index 7131c8a84f..a0d0bb7246 100644 --- a/sql/civicrm_option_groups/sms_api_type.sqldata.php +++ b/sql/civicrm_option_groups/sms_api_type.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('sms_api_type', 'a/0067') ->addMetadata([ 'title' => ts('Api Type'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ ['http', 'http', 1, 'is_reserved' => 1], ['xml', 'xml', 2, 'is_reserved' => 1], ['smtp', 'smtp', 3, 'is_reserved' => 1], diff --git a/sql/civicrm_option_groups/soft_credit_type.sqldata.php b/sql/civicrm_option_groups/soft_credit_type.sqldata.php index b8f58af642..defdecf520 100644 --- a/sql/civicrm_option_groups/soft_credit_type.sqldata.php +++ b/sql/civicrm_option_groups/soft_credit_type.sqldata.php @@ -5,7 +5,7 @@ return CRM_Core_CodeGen_OptionGroup::create('soft_credit_type', 'b/98') ->addMetadata([ 'title' => ts('Soft Credit Types'), ]) - ->addValues(['label', 'value', 'name'], [ + ->addValueTable(['label', 'value', 'name'], [ [ts('In Honor of'), 1, 'in_honor_of', 'is_reserved' => 1], [ts('In Memory of'), 2, 'in_memory_of', 'is_reserved' => 1], [ts('Solicited'), 3, 'solicited', 'is_reserved' => 1, 'is_default' => 1], diff --git a/sql/civicrm_option_groups/tag_used_for.sqldata.php b/sql/civicrm_option_groups/tag_used_for.sqldata.php index 8d2e4c43f5..815c3ebcd4 100644 --- a/sql/civicrm_option_groups/tag_used_for.sqldata.php +++ b/sql/civicrm_option_groups/tag_used_for.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('tag_used_for', 'a/0046') 'title' => ts('Tag Used For'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Contacts'), 'Contact', 'civicrm_contact'], [ts('Activities'), 'Activity', 'civicrm_activity'], [ts('Cases'), 'Case', 'civicrm_case'], diff --git a/sql/civicrm_option_groups/user_dashboard_options.sqldata.php b/sql/civicrm_option_groups/user_dashboard_options.sqldata.php index a90f64a07d..955fef7d95 100644 --- a/sql/civicrm_option_groups/user_dashboard_options.sqldata.php +++ b/sql/civicrm_option_groups/user_dashboard_options.sqldata.php @@ -4,7 +4,7 @@ return CRM_Core_CodeGen_OptionGroup::create('user_dashboard_options', 'a/0020') 'title' => ts('User Dashboard Options'), 'is_locked' => 1, ]) - ->addValues(['label', 'name', 'value', 'weight'], [ + ->addValueTable(['label', 'name', 'value', 'weight'], [ [ts('Groups'), 'Groups', 1, 1], [ts('Contributions'), 'CiviContribute', 2, 2], [ts('Memberships'), 'CiviMember', 3, 3], diff --git a/sql/civicrm_option_groups/visibility.sqldata.php b/sql/civicrm_option_groups/visibility.sqldata.php index 70880cee63..a2a98c2874 100644 --- a/sql/civicrm_option_groups/visibility.sqldata.php +++ b/sql/civicrm_option_groups/visibility.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('visibility', 'a/0035') ->addMetadata([ 'title' => ts('Visibility'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ ['Public', 'public', 1], ['Admin', 'admin', 2], ]); diff --git a/sql/civicrm_option_groups/website_type.sqldata.php b/sql/civicrm_option_groups/website_type.sqldata.php index 7bd1a0d020..697963c152 100644 --- a/sql/civicrm_option_groups/website_type.sqldata.php +++ b/sql/civicrm_option_groups/website_type.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('website_type', 'a/0045') ->addMetadata([ 'title' => ts('Website Type'), ]) - ->addValues(['label', 'name', 'value', 'weight'], [ + ->addValueTable(['label', 'name', 'value', 'weight'], [ ['Work', 'Work', 1, 1, 'is_default' => 1], ['Main', 'Main', 2, 2], ['Facebook', 'Facebook', 3, 3], diff --git a/sql/civicrm_option_groups/wysiwyg_editor.sqldata.php b/sql/civicrm_option_groups/wysiwyg_editor.sqldata.php index ea356e186b..c319cebd5c 100644 --- a/sql/civicrm_option_groups/wysiwyg_editor.sqldata.php +++ b/sql/civicrm_option_groups/wysiwyg_editor.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('wysiwyg_editor', 'a/0031') ->addMetadata([ 'title' => ts('WYSIWYG Editor'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Textarea'), 'Textarea', 1, 'is_reserved' => 1], [ts('CKEditor 4'), 'CKEditor', 2, 'is_reserved' => 1], ]); diff --git a/sql/civicrm_option_groups/wysiwyg_presets.sqldata.php b/sql/civicrm_option_groups/wysiwyg_presets.sqldata.php index 0fcf34b0cf..869dbd70bc 100644 --- a/sql/civicrm_option_groups/wysiwyg_presets.sqldata.php +++ b/sql/civicrm_option_groups/wysiwyg_presets.sqldata.php @@ -3,7 +3,7 @@ return CRM_Core_CodeGen_OptionGroup::create('wysiwyg_presets', 'a/0077') ->addMetadata([ 'title' => ts('WYSIWYG Editor Presets'), ]) - ->addValues(['label', 'name', 'value'], [ + ->addValueTable(['label', 'name', 'value'], [ [ts('Default'), 'default', 1, 'is_default' => 1], [ts('CiviMail'), 'civimail', 2, 'component_id' => 4], [ts('CiviEvent'), 'civievent', 3, 'component_id' => 1], -- 2.25.1