From e7c56123da1360198be94aea2e844fcb39a8d628 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Fri, 3 Oct 2025 12:45:50 +0200 Subject: [PATCH 1/2] #227: Added Drupal core patch to make conditionals based upon computed twig work --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index cb61499..ead9202 100644 --- a/composer.json +++ b/composer.json @@ -114,6 +114,9 @@ }, "enable-patching": true, "patches": { + "drupal/core": { + "Allow conditionals based on computed twig (https://www.drupal.org/project/webform/issues/3481569)": "https://www.drupal.org/files/issues/2024-11-05/revert-core-states.patch" + }, "drupal/coc_forms_auto_export": { "3256951: - Unable to receive attachments in emails sent": "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/11.diff" }, From 2873f6351039f102a9be7d935da746205d3fbf5d Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Fri, 3 Oct 2025 12:53:33 +0200 Subject: [PATCH 2/2] #227: Applied coding standards --- CHANGELOG.md | 3 +++ composer.json | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 880c6b7..ac48c57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ before starting to add changes. Use example [placed in the end of the page](#exa ## [Unreleased] +- [PR-228](https://github.com/OS2Forms/os2forms/pull/228) + Added Drupal Core patch ensuring conditionals based upon computed twig + works as intended. - [PR-101](https://github.com/OS2Forms/os2forms/pull/101) - Added support for `os2web_key` in Digital post - Switched from saving settings in key value store to config, i.e diff --git a/composer.json b/composer.json index ead9202..2cac6ff 100644 --- a/composer.json +++ b/composer.json @@ -114,12 +114,12 @@ }, "enable-patching": true, "patches": { - "drupal/core": { - "Allow conditionals based on computed twig (https://www.drupal.org/project/webform/issues/3481569)": "https://www.drupal.org/files/issues/2024-11-05/revert-core-states.patch" - }, "drupal/coc_forms_auto_export": { "3256951: - Unable to receive attachments in emails sent": "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/11.diff" }, + "drupal/core": { + "Allow conditionals based on computed twig (https://www.drupal.org/project/webform/issues/3481569)": "https://www.drupal.org/files/issues/2024-11-05/revert-core-states.patch" + }, "drupal/entity_print": { "2733781 - Add Export to Word Support": "https://www.drupal.org/files/issues/2019-11-22/2733781-47.patch" },