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

[BUGFIX] Moves disableButtonForDokType configuration #363

Merged
merged 1 commit into from
Jul 20, 2023

Conversation

Nimmermaer
Copy link
Contributor

The configuration is in the wrong place. After specifying the table, the configuration has no effect. See https://github.com/TYPO3/typo3/blob/0113c5431ba0ff48d90c13f89c636533c9c9deed/typo3/sysext/backend/Classes/Controller/PageLayoutController.php#L613

@brotkrueml
Copy link
Contributor

@Nimmermaer Good catch! Thanks for your contribution :-)

Also described here: https://docs.typo3.org/c/typo3/cms-core/main/en-us/Changelog/7.4/Feature-20194-ConfigurationForDisplayingTheSaveViewButton.html

@brotkrueml brotkrueml merged commit e357d51 into TYPO3-Documentation:main Jul 20, 2023
4 checks passed
@github-actions
Copy link
Contributor

The backport to 10.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply a8daed4... [BUGFIX] Moves  disableButtonForDokType configuration
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/PageTsconfig/TceMain.rst
CONFLICT (content): Merge conflict in Documentation/PageTsconfig/TceMain.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-10.4 10.4
# Navigate to the new working tree
cd .worktrees/backport-10.4
# Create a new branch
git switch --create backport-363-to-10.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a8daed49cdeee7eae86b0252c469ca173476f0af
# Push it to GitHub
git push --set-upstream origin backport-363-to-10.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-10.4

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

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.

2 participants