Fix template merge logic to preserve allOf blocks#196
Merged
Conversation
ericof
approved these changes
May 22, 2026
Member
|
Just run the formatter and should be ready to be merged |
ericof
approved these changes
May 22, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Discovered that
merge_template_configswas dropping theallOfblock from JSON schemas when merging a downstream template with an upstream one.Since conditional questions are defined using
allOf/if/thenblocks, any conditions defined in a downstream template (custom project) were being lost.This PR:
merge_template_configsto correctly append downstreamallOfitems to the upstream list.tests/config/test_merge_template.py.This works in tandem with the fix in
tui-forms(collective/tui-forms#23) to enable conditional questions incookieplonetemplates.Related
tui-formsPR: collective/tui-forms#23