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 integration categories #77

Merged

Conversation

format-gmbh
Copy link
Contributor

TCA, models, db field mapping corrected

Copy link
Contributor

@brotkrueml brotkrueml left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@format-gmbh Thanks for the fix 👍 Nice work.

@brotkrueml brotkrueml merged commit bc8adc3 into TYPO3-Documentation:main Mar 30, 2024
4 checks passed
Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

stdout
On branch backport-77-to-12.4
You are currently cherry-picking commit ea2db99.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

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-77-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ea2db99393de505edccd5e6034c9e341d5f6927d,5509412b73c93b4980931eb22922f5cbbdb79a17,c219bd240abf221aa5ce5ab7b2acf7c95fba4b72,43fb90969a4282a7bf961add21025912238e6653
# Push it to GitHub
git push --set-upstream origin backport-77-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-77-to-12.4.

brotkrueml pushed a commit that referenced this pull request Mar 30, 2024
The following errors have been fixed:

    T3docs\BlogExample\Domain\Model\Blog::getCategories(): Return value must be of type TYPO3\CMS\Extbase\Persistence\ObjectStorage, null returned
    T3docs\BlogExample\Domain\Model\Post::getCategories(): Return value must be of type TYPO3\CMS\Extbase\Persistence\ObjectStorage, null returned

Additionally, the categories were not displayed in the backend when editing records.

Releases: main, 12.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