-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin' into YSP-559-update-npm-packages
- Loading branch information
Showing
165 changed files
with
6,599 additions
and
199 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
patches/layout_builder/1330eff91b1234979cf697a66a48e34eb116b441-1.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| From f046b109bdaa308f3063980026c0b63227469012 Mon Sep 17 00:00:00 2001 | ||
| From: David Blankenship <[email protected]> | ||
| Date: Mon, 29 Jul 2024 11:15:16 -0400 | ||
| Subject: [PATCH] apply saved | ||
|
|
||
| --- | ||
| .../layout_builder/src/Form/ConfigureBlockFormBase.php | 10 +++++++++- | ||
| 1 file changed, 9 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/core/modules/layout_builder/src/Form/ConfigureBlockFormBase.php b/core/modules/layout_builder/src/Form/ConfigureBlockFormBase.php | ||
| index 8dd6333269..16b0a8cd70 100644 | ||
| --- a/core/modules/layout_builder/src/Form/ConfigureBlockFormBase.php | ||
| +++ b/core/modules/layout_builder/src/Form/ConfigureBlockFormBase.php | ||
| @@ -365,7 +365,15 @@ public function submitForm(array &$form, FormStateInterface $form_state) { | ||
| $block_content = $form['settings']['block_form']['#block']; | ||
| $block_content->setReusable(); | ||
| $block_content->setInfo($block_info); | ||
| - $block_content->save(); | ||
| + $saved = $block_content->save(); | ||
| + | ||
| + // If it didn't save, it's probably because we're using the same cloned | ||
| + // item somewhere else with different revisions. So, we'll create a new | ||
| + // block_content item to make sure it's fresh and won't interfere. | ||
| + if (!$saved) { | ||
| + $block_content = $block_content->createDuplicate(); | ||
| + $block_content->save(); | ||
| + } | ||
|
|
||
| $block_label_display = $form_state->getValue('settings')['label_display']; | ||
| $this->block = $this->blockManager->createInstance('block_content:' . $block_content->uuid(), [ | ||
| -- | ||
| 2.45.2 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
web/profiles/custom/yalesites_profile/config/sync/block_content.type.inline_message.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| uuid: b692caf5-825e-4c39-b6d7-762778de4b6d | ||
| langcode: en | ||
| status: true | ||
| dependencies: | ||
| module: | ||
| - entity_redirect | ||
| third_party_settings: | ||
| entity_redirect: | ||
| redirect: | ||
| add: | ||
| active: 0 | ||
| destination: default | ||
| url: '' | ||
| external: '' | ||
| edit: | ||
| active: 0 | ||
| destination: default | ||
| url: '' | ||
| external: '' | ||
| delete: | ||
| active: 0 | ||
| destination: default | ||
| url: '' | ||
| external: '' | ||
| anonymous: | ||
| active: 0 | ||
| destination: default | ||
| url: '' | ||
| external: '' | ||
| id: inline_message | ||
| label: 'In-Line Message' | ||
| revision: 0 | ||
| description: 'Add a non-dismissible message box in your content to draw attention to important information or warnings.' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,3 +6,4 @@ ignored_config_entities: | |
| - 'ys_alert.settings:alert' | ||
| - 'ys_core*' | ||
| - ys_themes.theme_settings | ||
| - 'ys_localist*' | ||
8 changes: 8 additions & 0 deletions
8
web/profiles/custom/yalesites_profile/config/sync/core.date_format.event_date_only.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| uuid: 359832b9-abb4-4a34-830c-3769eca844cc | ||
| langcode: en | ||
| status: true | ||
| dependencies: { } | ||
| id: event_date_only | ||
| label: 'Event date only' | ||
| locked: false | ||
| pattern: 'l, F jS, Y' |
8 changes: 8 additions & 0 deletions
8
web/profiles/custom/yalesites_profile/config/sync/core.date_format.event_time_only.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| uuid: 7ed4c8d9-69cf-43f3-92bb-dda5ddd9eb96 | ||
| langcode: en | ||
| status: true | ||
| dependencies: { } | ||
| id: event_time_only | ||
| label: 'Event time only' | ||
| locked: false | ||
| pattern: 'g:i a T' |
92 changes: 92 additions & 0 deletions
92
...tes_profile/config/sync/core.entity_form_display.block_content.inline_message.default.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| uuid: d9afb06f-c30e-42f6-a92c-4a4978070a45 | ||
| langcode: en | ||
| status: true | ||
| dependencies: | ||
| config: | ||
| - block_content.type.inline_message | ||
| - field.field.block_content.inline_message.field_heading | ||
| - field.field.block_content.inline_message.field_link | ||
| - field.field.block_content.inline_message.field_style_color | ||
| - field.field.block_content.inline_message.field_text | ||
| module: | ||
| - allowed_formats | ||
| - hide_revision_field | ||
| - linkit | ||
| - maxlength | ||
| - text | ||
| id: block_content.inline_message.default | ||
| targetEntityType: block_content | ||
| bundle: inline_message | ||
| mode: default | ||
| content: | ||
| field_heading: | ||
| type: text_textfield | ||
| weight: 2 | ||
| region: content | ||
| settings: | ||
| size: 60 | ||
| placeholder: '' | ||
| third_party_settings: | ||
| allowed_formats: | ||
| hide_help: '1' | ||
| hide_guidelines: '1' | ||
| maxlength: | ||
| maxlength_js: 50 | ||
| maxlength_js_label: 'Content recommended length set to @limit characters, remaining: <strong>@remaining</strong>' | ||
| maxlength_js_enforce: false | ||
| field_link: | ||
| type: linkit | ||
| weight: 6 | ||
| region: content | ||
| settings: | ||
| placeholder_url: '' | ||
| placeholder_title: '' | ||
| linkit_profile: default | ||
| linkit_auto_link_text: false | ||
| third_party_settings: | ||
| maxlength: | ||
| maxlength_js: null | ||
| maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>' | ||
| maxlength_js_enforce: false | ||
| field_style_color: | ||
| type: options_select | ||
| weight: 3 | ||
| region: content | ||
| settings: { } | ||
| third_party_settings: { } | ||
| field_text: | ||
| type: text_textarea | ||
| weight: 4 | ||
| region: content | ||
| settings: | ||
| rows: 5 | ||
| placeholder: '' | ||
| third_party_settings: | ||
| allowed_formats: | ||
| hide_help: '1' | ||
| hide_guidelines: '1' | ||
| maxlength: | ||
| maxlength_js: 500 | ||
| maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>' | ||
| maxlength_js_enforce: true | ||
| info: | ||
| type: string_textfield | ||
| weight: -5 | ||
| region: content | ||
| settings: | ||
| size: 60 | ||
| placeholder: '' | ||
| third_party_settings: { } | ||
| revision_log: | ||
| type: hide_revision_field_log_widget | ||
| weight: 80 | ||
| region: content | ||
| settings: | ||
| rows: 5 | ||
| placeholder: '' | ||
| show: true | ||
| default: '' | ||
| permission_based: false | ||
| allow_user_settings: true | ||
| third_party_settings: { } | ||
| hidden: { } |
Oops, something went wrong.