From d64618abd0d7a345bd28f32c8371cb0b7d191b54 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Wed, 24 Aug 2022 14:42:52 -0400
Subject: [PATCH] ISTWCMS-5643: ensure that features are not overridden for
core update to 9.4.5
---
config/install/editor.editor.uw_tf_basic.yml | 4 ----
.../install/editor.editor.uw_tf_standard.yml | 2 --
...ser_block.inline_blockuw_cbl_mailchimp.yml | 2 +-
...lock.inline_blockuw_cbl_social_intents.yml | 2 +-
.../install/metatag.metatag_defaults.403.yml | 2 +-
.../pathauto.pattern.uw_path_blog_post.yml | 2 +-
.../pathauto.pattern.uw_path_catalog_item.yml | 2 +-
.../pathauto.pattern.uw_path_contact.yml | 2 +-
.../pathauto.pattern.uw_path_event.yml | 2 +-
.../pathauto.pattern.uw_path_news_item.yml | 2 +-
...pathauto.pattern.uw_path_opportunities.yml | 2 +-
.../pathauto.pattern.uw_path_profile.yml | 2 +-
.../pathauto.pattern.uw_path_service.yml | 2 +-
.../pathauto.pattern.uw_path_sidebar.yml | 2 +-
.../pathauto.pattern.uw_path_site_footer.yml | 2 +-
config/install/views.view.content_types.yml | 6 ++---
.../linkit.linkit_profile.default.yml | 22 +++++++++----------
uw_cfg_common.info.yml | 1 +
18 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/config/install/editor.editor.uw_tf_basic.yml b/config/install/editor.editor.uw_tf_basic.yml
index 9ddb38e4..537147a9 100644
--- a/config/install/editor.editor.uw_tf_basic.yml
+++ b/config/install/editor.editor.uw_tf_basic.yml
@@ -44,10 +44,6 @@ settings:
drupallink:
linkit_enabled: true
linkit_profile: default
- language:
- language_list: un
- stylescombo:
- styles: ''
image_upload:
status: false
scheme: public
diff --git a/config/install/editor.editor.uw_tf_standard.yml b/config/install/editor.editor.uw_tf_standard.yml
index 07d90b0b..8646f2b9 100644
--- a/config/install/editor.editor.uw_tf_standard.yml
+++ b/config/install/editor.editor.uw_tf_standard.yml
@@ -86,8 +86,6 @@ settings:
drupallink:
linkit_enabled: true
linkit_profile: default
- language:
- language_list: un
stylescombo:
styles: "p.highlight|Highlight\r\np.caption|Caption\r\nins|Inserted text\r\ndel|Deleted text\r\ncode|Inline code\r\nkbd|Key input\r\nsamp|Sample output\r\nvar|Variable\r\naddress|Address\r\n"
image_upload:
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_mailchimp.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_mailchimp.yml
index bd1378e1..37d95f44 100644
--- a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_mailchimp.yml
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_mailchimp.yml
@@ -5,7 +5,7 @@ id: inline_blockuw_cbl_mailchimp
block_id: 'inline_block:uw_cbl_mailchimp'
category: uw_bc_external_embeds
label: Mailchimp
+weight: null
image_path: images/layout_builder_browser/mailchimp.svg
image_path_base: 'theme:uw_fdsu_theme_resp'
image_alt: ''
-weight: null
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_social_intents.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_social_intents.yml
index 1db5fe5b..68e70e28 100644
--- a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_social_intents.yml
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_social_intents.yml
@@ -5,7 +5,7 @@ id: inline_blockuw_cbl_social_intents
block_id: 'inline_block:uw_cbl_social_intents'
category: uw_bc_external_embeds
label: 'Social Intents'
+weight: null
image_path: images/layout_builder_browser/socialintents.svg
image_path_base: 'theme:uw_fdsu_theme_resp'
image_alt: ''
-weight: null
diff --git a/config/install/metatag.metatag_defaults.403.yml b/config/install/metatag.metatag_defaults.403.yml
index a8ce604b..472e300a 100644
--- a/config/install/metatag.metatag_defaults.403.yml
+++ b/config/install/metatag.metatag_defaults.403.yml
@@ -5,5 +5,5 @@ id: '403'
label: '403 access denied'
tags:
shortlink: '[site:url]'
- robots: 'noindex'
+ robots: noindex
canonical_url: '[site:url]'
diff --git a/config/install/pathauto.pattern.uw_path_blog_post.yml b/config/install/pathauto.pattern.uw_path_blog_post.yml
index 0ba12994..e80510cf 100644
--- a/config/install/pathauto.pattern.uw_path_blog_post.yml
+++ b/config/install/pathauto.pattern.uw_path_blog_post.yml
@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'blog/[node:title]'
selection_criteria:
6008045d-ac62-416d-a3f4-46c30aaab4d5:
- id: entity_bundle:node
+ id: 'entity_bundle:node'
bundles:
uw_ct_blog: uw_ct_blog
negate: false
diff --git a/config/install/pathauto.pattern.uw_path_catalog_item.yml b/config/install/pathauto.pattern.uw_path_catalog_item.yml
index 725a83d3..95b28e3f 100644
--- a/config/install/pathauto.pattern.uw_path_catalog_item.yml
+++ b/config/install/pathauto.pattern.uw_path_catalog_item.yml
@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'catalogs/[node:field_uw_catalog_catalog]/[node:title]'
selection_criteria:
337b44da-103c-4fa1-a2a2-27a56e73e8f1:
- id: entity_bundle:node
+ id: 'entity_bundle:node'
bundles:
uw_ct_catalog_item: uw_ct_catalog_item
negate: false
diff --git a/config/install/pathauto.pattern.uw_path_contact.yml b/config/install/pathauto.pattern.uw_path_contact.yml
index 6716018f..63d7a341 100644
--- a/config/install/pathauto.pattern.uw_path_contact.yml
+++ b/config/install/pathauto.pattern.uw_path_contact.yml
@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'contacts/[node:title]'
selection_criteria:
13ad4ca2-9556-4f2f-89fc-45501bae3153:
- id: entity_bundle:node
+ id: 'entity_bundle:node'
bundles:
uw_ct_contact: uw_ct_contact
negate: false
diff --git a/config/install/pathauto.pattern.uw_path_event.yml b/config/install/pathauto.pattern.uw_path_event.yml
index 30634b76..8191a8b2 100644
--- a/config/install/pathauto.pattern.uw_path_event.yml
+++ b/config/install/pathauto.pattern.uw_path_event.yml
@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'events/[node:title]'
selection_criteria:
0f8d7153-46e2-4788-a25b-8a998481ed5d:
- id: entity_bundle:node
+ id: 'entity_bundle:node'
bundles:
uw_ct_event: uw_ct_event
negate: false
diff --git a/config/install/pathauto.pattern.uw_path_news_item.yml b/config/install/pathauto.pattern.uw_path_news_item.yml
index b016e0ce..1ef89f2b 100644
--- a/config/install/pathauto.pattern.uw_path_news_item.yml
+++ b/config/install/pathauto.pattern.uw_path_news_item.yml
@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'news/[node:title]'
selection_criteria:
92cc743b-f206-40a5-a6a9-4f67373876ad:
- id: entity_bundle:node
+ id: 'entity_bundle:node'
bundles:
uw_ct_news_item: uw_ct_news_item
negate: false
diff --git a/config/install/pathauto.pattern.uw_path_opportunities.yml b/config/install/pathauto.pattern.uw_path_opportunities.yml
index 98752243..a3e4a1a7 100644
--- a/config/install/pathauto.pattern.uw_path_opportunities.yml
+++ b/config/install/pathauto.pattern.uw_path_opportunities.yml
@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'opportunities/[node:title]'
selection_criteria:
85a0576d-37f6-4897-92c2-cc7f18605172:
- id: entity_bundle:node
+ id: 'entity_bundle:node'
bundles:
uw_ct_opportunity: uw_ct_opportunity
negate: false
diff --git a/config/install/pathauto.pattern.uw_path_profile.yml b/config/install/pathauto.pattern.uw_path_profile.yml
index 4d8c7025..6afbe3da 100644
--- a/config/install/pathauto.pattern.uw_path_profile.yml
+++ b/config/install/pathauto.pattern.uw_path_profile.yml
@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'profiles/[node:title]'
selection_criteria:
0f8a9aae-cf05-4d9b-9dd9-a128ce9fa7cf:
- id: entity_bundle:node
+ id: 'entity_bundle:node'
bundles:
uw_ct_profile: uw_ct_profile
negate: false
diff --git a/config/install/pathauto.pattern.uw_path_service.yml b/config/install/pathauto.pattern.uw_path_service.yml
index 43817035..2d16fa84 100644
--- a/config/install/pathauto.pattern.uw_path_service.yml
+++ b/config/install/pathauto.pattern.uw_path_service.yml
@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'services/[node:title]'
selection_criteria:
21884b74-d98d-49ba-9cab-9093f18a6a95:
- id: entity_bundle:node
+ id: 'entity_bundle:node'
bundles:
uw_ct_service: uw_ct_service
negate: false
diff --git a/config/install/pathauto.pattern.uw_path_sidebar.yml b/config/install/pathauto.pattern.uw_path_sidebar.yml
index 9323abf4..5d5ab31b 100644
--- a/config/install/pathauto.pattern.uw_path_sidebar.yml
+++ b/config/install/pathauto.pattern.uw_path_sidebar.yml
@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'sidebars/[node:title]'
selection_criteria:
96550c84-2385-43f7-aa25-ca80528ddf91:
- id: entity_bundle:node
+ id: 'entity_bundle:node'
bundles:
uw_ct_sidebar: uw_ct_sidebar
negate: false
diff --git a/config/install/pathauto.pattern.uw_path_site_footer.yml b/config/install/pathauto.pattern.uw_path_site_footer.yml
index 80d2d185..b79c9223 100644
--- a/config/install/pathauto.pattern.uw_path_site_footer.yml
+++ b/config/install/pathauto.pattern.uw_path_site_footer.yml
@@ -9,7 +9,7 @@ type: 'canonical_entities:node'
pattern: 'site-footer/[node:title]'
selection_criteria:
1c4af52c-2d8a-420f-a820-a89df82759ef:
- id: entity_bundle:node
+ id: 'entity_bundle:node'
bundles:
uw_ct_site_footer: uw_ct_site_footer
negate: false
diff --git a/config/install/views.view.content_types.yml b/config/install/views.view.content_types.yml
index 6f86a7c4..87ee6061 100644
--- a/config/install/views.view.content_types.yml
+++ b/config/install/views.view.content_types.yml
@@ -99,7 +99,7 @@ display:
hide_empty: false
empty_zero: false
hide_alter_empty: true
- entity_type: entity_bundle:node
+ entity_type: 'entity_bundle:node'
plugin_id: standard
description:
id: description
@@ -149,7 +149,7 @@ display:
hide_empty: false
empty_zero: false
hide_alter_empty: true
- entity_type: entity_bundle:node
+ entity_type: 'entity_bundle:node'
plugin_id: standard
operation:
id: operation
@@ -199,7 +199,7 @@ display:
hide_empty: false
empty_zero: false
hide_alter_empty: true
- entity_type: entity_bundle:node
+ entity_type: 'entity_bundle:node'
plugin_id: config_entity_operations
filters: { }
sorts: { }
diff --git a/config/optional/linkit.linkit_profile.default.yml b/config/optional/linkit.linkit_profile.default.yml
index 89dd72a7..ee23489e 100644
--- a/config/optional/linkit.linkit_profile.default.yml
+++ b/config/optional/linkit.linkit_profile.default.yml
@@ -3,13 +3,14 @@ status: true
dependencies:
module:
- node
-label: Default
id: default
+label: Default
description: 'A default Linkit profile'
matchers:
556010a3-e317-48b3-b4ed-854c10f4b950:
- id: 'entity:node'
uuid: 556010a3-e317-48b3-b4ed-854c10f4b950
+ id: 'entity:node'
+ weight: -9
settings:
metadata: '[node:content-type] by [node:author] | [node:created:long] (node [node:nid])'
bundles: { }
@@ -17,20 +18,20 @@ matchers:
substitution_type: canonical
limit: 100
include_unpublished: true
- weight: -9
6104a100-f463-4c40-8bde-6c442591afe7:
- id: email
uuid: 6104a100-f463-4c40-8bde-6c442591afe7
- settings: { }
+ id: email
weight: -6
+ settings: { }
d53fbc60-f2a7-40b5-a643-1c20c21143a4:
- id: anchor_basic
uuid: d53fbc60-f2a7-40b5-a643-1c20c21143a4
- settings: { }
+ id: anchor_basic
weight: -10
+ settings: { }
dbcc29e8-5c1a-4a8f-8a76-f4f7adc645a5:
- id: 'entity:media'
uuid: dbcc29e8-5c1a-4a8f-8a76-f4f7adc645a5
+ id: 'entity:media'
+ weight: -8
settings:
metadata: '<img src="[media:field_media_image:linkit_result_thumbnail]" alt="[media:field_media_image:alt]">'
bundles:
@@ -38,10 +39,10 @@ matchers:
group_by_bundle: true
substitution_type: media
limit: 100
- weight: -8
280dc52b-0208-4458-b3dc-21ddbaac15e8:
- id: 'entity:media'
uuid: 280dc52b-0208-4458-b3dc-21ddbaac15e8
+ id: 'entity:media'
+ weight: -7
settings:
metadata: ''
bundles:
@@ -49,4 +50,3 @@ matchers:
group_by_bundle: true
substitution_type: media
limit: 100
- weight: -7
diff --git a/uw_cfg_common.info.yml b/uw_cfg_common.info.yml
index 7119099a..ea720085 100644
--- a/uw_cfg_common.info.yml
+++ b/uw_cfg_common.info.yml
@@ -49,6 +49,7 @@ dependencies:
- 'drupal:user'
- 'drupal:userprotect'
- 'drupal:views'
+ - 'fillpdf:fillpdf'
- 'metatag:metatag_extended_perms'
- 'quick_node_clone:quick_node_clone'
- 'scheduler:scheduler'
--
GitLab