Repository navigation
add multivalue where conditions on IDs in graphql, fix multivalue fil… - #17654
Merged
MikeAlhayek merged 1 commit intoMar 24, 2025
Merged
Conversation
Contributor
Author
|
In case this is merged, can it please be added to some 2.1.X version? |
gvkries
approved these changes
Mar 23, 2025
This was referenced Apr 1, 2025
Contributor
Author
|
@MikeAlhayek / @gvkries Can we merge this into 2.1.7 release please? It is breaking our websites currently |
Member
|
/backport to release/2.1 |
Contributor
|
Started backporting to release/2.1: https://github.com/OrchardCMS/OrchardCore/actions/runs/14196506677 |
Contributor
|
@MikeAlhayek backporting to "release/2.1" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: add multivalue where conditions on IDs in graphql, fix multivalue filters
Using index info to reconstruct a base tree...
M src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/WhereInputObjectGraphType.cs
Falling back to patching base and 3-way merge...
Auto-merging src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/WhereInputObjectGraphType.cs
CONFLICT (content): Merge conflict in src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/WhereInputObjectGraphType.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 add multivalue where conditions on IDs in graphql, fix multivalue filters
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Member
|
@MikeKry the backport failed due to conflict. Please create a branch out of release/2.1 branch not main, apply the fix and create a PR targeting release/2.1 branch not main. Ping me when you have the PR and I'll merge it. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #17653
Restores _in and _not_in filters on ID types
Cause by 3853b97#diff-08182851c6e450be93eadab38c390ba2450025dcf34165cecd3796b4e0d3fe5e
Fixes where in/not in filters, it was not possible to use array filter type - caused by unwrapping here 5dc244b#diff-08182851c6e450be93eadab38c390ba2450025dcf34165cecd3796b4e0d3fe5eR105