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

Use myext_pi1 instead of my_ext_pi1 #406

Merged
merged 4 commits into from
Dec 2, 2023
Merged

Use myext_pi1 instead of my_ext_pi1 #406

merged 4 commits into from
Dec 2, 2023

Conversation

sypets
Copy link
Contributor

@sypets sypets commented Dec 2, 2023

On the TCEFORM page there are several examples for setting properties in Flexforms. Usually "my_ext_pi1" is given, but this should rather by "myext_pi1".

Resolves: #403

On the TCEFORM page there are several examples for setting properties
in Flexforms. Usually "my_ext_pi1" is given, but this should rather
by "myext_pi1".

Resolves: #403
Documentation/UsingSetting/PageTSconfig.rst Outdated Show resolved Hide resolved
Documentation/UsingSetting/PageTSconfig.rst Outdated Show resolved Hide resolved
Documentation/UsingSetting/PageTSconfig.rst Outdated Show resolved Hide resolved
@brotkrueml
Copy link
Contributor

@sypets Good catch! Thanks for your contribution 👍

@brotkrueml brotkrueml merged commit e79f96c into TYPO3-Documentation:main Dec 2, 2023
3 checks passed
Copy link
Contributor

github-actions bot commented Dec 2, 2023

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 3615284... Use myext_pi1 instead of my_ext_pi1
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/TceForm.rst
CONFLICT (content): Merge conflict in Documentation/PageTsconfig/TceForm.rst
Auto-merging Documentation/UsingSetting/PageTSconfig.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-406-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 361528451ff2d2799cab78674c40b0cdd5410004,64d69f40a968c525dafe0626529da8b59187e13b,d20fab56c2bacd673a04f1f0a7aa48967a0aa232,33d31a9356c3b498037d1b667be3fec032d89ebe
# Push it to GitHub
git push --set-upstream origin backport-406-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-406-to-11.5.

@sypets
Copy link
Contributor Author

sypets commented Dec 2, 2023

@brotkrueml I accidentally left the section Documentation/UsingSetting/PageTSconfig.rst in here. I noticed afterwards, there is already a description in TCEFORM at the top of the page.

I will add another PR to remove it again. Sorry.

brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-TSconfig that referenced this pull request Dec 2, 2023
On the TCEFORM page there are several examples for setting properties
in Flexforms. Usually "my_ext_pi1" is given, but this should rather
by "myext_pi1".

Resolves: TYPO3-Documentation#403

---------

Co-authored-by: Chris Müller <2566282+brotkrueml@users.noreply.github.com>
brotkrueml added a commit that referenced this pull request Dec 2, 2023
On the TCEFORM page there are several examples for setting properties
in Flexforms. Usually "my_ext_pi1" is given, but this should rather
by "myext_pi1".

Resolves: #403

---------

Co-authored-by: Sybille Peters <sypets@gmx.de>
brotkrueml pushed a commit that referenced this pull request Dec 2, 2023
This section was prematurely committed and is unnecessary since
there is already a description in TCEFORM for overriding
FlexForm settings.

Related: #406
Releases: main, 12.4, 11.5
github-actions bot pushed a commit that referenced this pull request Dec 2, 2023
This section was prematurely committed and is unncessary since
there is already a description in TCEFORM for overriding
FlexForm settings.

Related: #406
github-actions bot pushed a commit that referenced this pull request Dec 2, 2023
This section was prematurely committed and is unncessary since
there is already a description in TCEFORM for overriding
FlexForm settings.

Related: #406
brotkrueml pushed a commit that referenced this pull request Dec 2, 2023
This section was prematurely committed and is unnecessary since
there is already a description in TCEFORM for overriding
FlexForm settings.

Related: #406
Releases: main, 12.4, 11.5

Co-authored-by: Sybille Peters <sypets@gmx.de>
brotkrueml pushed a commit that referenced this pull request Dec 2, 2023
This section was prematurely committed and is unnecessary since
there is already a description in TCEFORM for overriding
FlexForm settings.

Related: #406
Releases: main, 12.4, 11.5

Co-authored-by: Sybille Peters <sypets@gmx.de>
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.

Overriding Flexform example is wrong: uses extension key with underscore in "plugin signature"
2 participants