Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove exclusiveKeys property for some select renderTypes #861

Merged
merged 2 commits into from
Nov 14, 2023
Merged

Remove exclusiveKeys property for some select renderTypes #861

merged 2 commits into from
Nov 14, 2023

Conversation

sypets
Copy link
Contributor

@sypets sypets commented Nov 14, 2023

The property exclusiveKeys is not available for all select types, it is only available for selectMultipleSideBySide and selectTree renderType (and category type).

The property is removed for the others and a note added.

The type category is left as is.

Resolves: #426

The property exclusiveKeys is not available for all select
types, it is only available for selectMultipleSideBySide
and selectTree renderType.

The property is removed for the others and a note added.

The type category is left as is.

Resolves: #426
@sypets sypets requested a review from brotkrueml November 14, 2023 19:18
@brotkrueml
Copy link
Contributor

@sypets Thanks again for your contribution 👍

@brotkrueml brotkrueml merged commit e4f91ba into TYPO3-Documentation:main Nov 14, 2023
1 check passed
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 2d757ac... Remove exclusiveKeys property for some select renderTypes
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging Documentation/ColumnsConfig/Type/Select/CheckBox/Properties.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/CheckBox/Properties.rst
Auto-merging Documentation/ColumnsConfig/Type/Select/Single/Properties.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/Single/Properties.rst
Auto-merging Documentation/ColumnsConfig/Type/Select/SingleBox/Properties.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/SingleBox/Properties.rst

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-861-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 2d757ac605329e41114f558ebe7a626e1f70d906,855797d653bd189e93ad3242663272c879e1725a
# Push it to GitHub
git push --set-upstream origin backport-861-to-11.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-11.5

Then, create a pull request where the base branch is 11.5 and the compare/head branch is backport-861-to-11.5.

brotkrueml pushed a commit to brotkrueml/TYPO3CMS-Reference-TCA that referenced this pull request Nov 15, 2023
…mentation#861)

The property exclusiveKeys is not available for all select
types, it is only available for selectMultipleSideBySide
and selectTree renderType.

The property is removed for the others and a note added.

The type category is left as is.

Resolves: TYPO3-Documentation#426
brotkrueml added a commit that referenced this pull request Nov 15, 2023
The property exclusiveKeys is not available for all select
types, it is only available for selectMultipleSideBySide
and selectTree renderType.

The property is removed for the others and a note added.

The type category is left as is.

Resolves: #426

Co-authored-by: Sybille Peters <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Option "exclusiveKeys" only works for "selectMultipleSideBySide" / "selectTree"
2 participants