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

[TASK] Revise "Ajax in the backend" chapter #3471

Merged

Conversation

brotkrueml
Copy link
Contributor

  • Move PHP/JS snippets into separate files
  • Recommend to add the extension name to the route key for better uniqueness
  • Substitute included BackendAjaxRoutes.rst.txt with a custom one to be in-line with the PHP controller example namespace (the BackendAjaxRoutes.rst.txt is still in use in another place)
  • Remove the ResponseInterface constructor argument list: the response factory is used, so no need to list constructor arguments
  • Use ES6 instead of RequireJS in JavaScript example

This is a preparation for merging the "Ajax" chapter with the "Ajax, clientside" chapter.

Related: #2331
Releases: main, 12.4

- Move PHP/JS snippets into separate files
- Recommend to add the extension name to the route key for better uniqueness
- Substitute included BackendAjaxRoutes.rst.txt with a custom one to be in-line with the PHP controller example namespace (the BackendAjaxRoutes.rst.txt is still in use in another place)
- Use ES6 instead of RequireJS in JavaScript example

This is a preparation for merging the "Ajax" chapter with the "Ajax, clientside" chapter.

Related: TYPO3-Documentation#2331
Releases: main, 12.4
@brotkrueml brotkrueml added the content Related to changing / updating / adding ... content label Sep 25, 2023
@brotkrueml brotkrueml requested a review from linawolf September 25, 2023 18:21
@brotkrueml brotkrueml self-assigned this Sep 25, 2023
@brotkrueml brotkrueml added the backport 12.4 Backport to TYPO3v12 label Sep 26, 2023
@brotkrueml brotkrueml merged commit eaca2ee into TYPO3-Documentation:main Sep 26, 2023
@brotkrueml brotkrueml deleted the streamline-backend-ajax branch September 26, 2023 15:30
@github-actions
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 00fb1d21... [TASK] Revise "Ajax in the backend" chapter
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/ApiOverview/Backend/Ajax.rst
CONFLICT (content): Merge conflict in Documentation/ApiOverview/Backend/Ajax.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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-3471-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 00fb1d21023a9af41f155f38ea058eb77ed8713c
# Push it to GitHub
git push --set-upstream origin backport-3471-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

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

brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-CoreApi that referenced this pull request Sep 26, 2023
- Move PHP/JS snippets into separate files
- Recommend to add the extension name to the route key for better uniqueness
- Substitute included BackendAjaxRoutes.rst.txt with a custom one to be in-line with the PHP controller example namespace (the BackendAjaxRoutes.rst.txt is still in use in another place)
- Use ES6 instead of RequireJS in JavaScript example

Related: TYPO3-Documentation#2331
Releases: main, 12.4
brotkrueml added a commit that referenced this pull request Sep 26, 2023
- Move PHP/JS snippets into separate files
- Recommend to add the extension name to the route key for better uniqueness
- Substitute included BackendAjaxRoutes.rst.txt with a custom one to be in-line with the PHP controller example namespace (the BackendAjaxRoutes.rst.txt is still in use in another place)
- Use ES6 instead of RequireJS in JavaScript example

Related: #2331
Releases: main, 12.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 12.4 Backport to TYPO3v12 backport-done content Related to changing / updating / adding ... content
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants