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 for getIcon indexer and conflicting "image" id #3917

Merged
merged 3 commits into from
Mar 5, 2024
Merged

Conversation

frapell
Copy link
Member

@frapell frapell commented Mar 5, 2024

This PR fixes #3916

@mister-roboto
Copy link

@frapell thanks for creating this Pull Request and helping to improve Plone!

TL;DR: Finish pushing changes, pass all other checks, then paste a comment:

@jenkins-plone-org please run jobs

To ensure that these changes do not break other parts of Plone, the Plone test suite matrix needs to pass, but it takes 30-60 min. Other CI checks are usually much faster and the Plone Jenkins resources are limited, so when done pushing changes and all other checks pass either start all Jenkins PR jobs yourself, or simply add the comment above in this PR to start all the jobs automatically.

Happy hacking!

@frapell
Copy link
Member Author

frapell commented Mar 5, 2024

@jenkins-plone-org please run jobs

Copy link
Member

@davisagli davisagli left a comment

Choose a reason for hiding this comment

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

Looks okay to me, except for one small question.

Could you open a PR to the master branch too, so the change doesn't get stuck in 6.0 only?

Products/CMFPlone/tests/testCatalogTool.py Show resolved Hide resolved
@frapell frapell merged commit f728dda into 6.0.x Mar 5, 2024
4 checks passed
@frapell frapell deleted the issue-3916 branch March 5, 2024 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants