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

Set "or_group" filter option at SearchHandler::search() #6992

Merged
merged 1 commit into from
Mar 30, 2021

Conversation

phansys
Copy link
Member

@phansys phansys commented Mar 30, 2021

Subject

Set "or_group" filter option at SearchHandler::search()

I am targeting this branch, because this change respects BC.

Related to #2850, #3368, #5569, sonata-project/SonataDoctrineORMAdminBundle#1373.

Changelog

### Added
- "or_group" filter option at `SearchHandler::search()`.

@phansys phansys added the patch label Mar 30, 2021
@phansys phansys marked this pull request as ready for review March 30, 2021 19:49
@phansys phansys requested a review from a team March 30, 2021 19:49
composer.json Outdated
@@ -69,6 +69,7 @@
"doctrine/doctrine-bundle": ">=3",
"sonata-project/core-bundle": "<3.20",
"sonata-project/doctrine-extensions": "<1.8",
"sonata-project/doctrine-orm-admin-bundle": "<3.32",
Copy link
Member

Choose a reason for hiding this comment

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

adding a conflict here does not seem right, is it needed to make it work?

Copy link
Member Author

Choose a reason for hiding this comment

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

Versions previous to sonata-project/doctrine-orm-admin-bundle 3.32 haven't the fix.
Actually, the fix is provided by that package.

Copy link
Member

Choose a reason for hiding this comment

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

Then, to get the fix you just have to update that package, not this one, right? I mean, we do not conflict on the orm-bundle when we fix something here

Copy link
Member Author

Choose a reason for hiding this comment

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

It's fine, no problem.

Copy link
Member Author

Choose a reason for hiding this comment

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

The commit message and the PR description were also updated.

@phansys phansys changed the title Fix search results for ORM queries that have previous conditions Set "or_group" filter option at SearchHandler::search() Mar 30, 2021
@phansys phansys requested a review from a team March 30, 2021 20:52
@VincentLanglet VincentLanglet merged commit 09e8b7d into sonata-project:3.x Mar 30, 2021
@VincentLanglet
Copy link
Member

Thanks @phansys

@phansys phansys deleted the or_group branch March 30, 2021 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants