Avoid errors and incorrect listings in Trash Manager #16433
Merged
Conversation
This file contains 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
Change where condition to correctly group $query param and perform early return of criteria if no deletable resources exist
smg6511
changed the title
Codecov ReportPatch coverage has no change and project coverage change:
Additional details and impacted files@@ Coverage Diff @@
## 3.x #16433 +/- ##
============================================
- Coverage 21.73% 21.73% -0.01%
Complexity 10483 10483
============================================
Files 561 561
Lines 31614 31618 +4
============================================
Hits 6872 6872
- Misses 24742 24746 +4
☔ View full report in Codecov by Sentry. |
Mark-H
approved these changes
Aug 4, 2023
Ibochkarev
approved these changes
Aug 8, 2023
smg6511
added
pr/ready-for-merging
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does it do?
Changed where condition to correctly group
$querysearch targets (pagetitle | longtitle) and perform early return of criteria if no deletable resources exist.Why is it needed?
Ensures the trash manager list only shows deleted items when additional filtering is applied.
How to test
Clear all caches and experiment with deleting resources and purging them in the trash manager. Also, use the search field in the trash manager to verify all works as expected.
Related issue(s)/PR(s)
Provides a more reliable solution attempted in #16228 and avoids the issue #16415 is trying to solve. Note that while both #16228 and #16415 are targeted to 2.x, the
prepareQueryBeforeCountin the changedGetListprocessor is identical for both 2.x and 3.x, so this solution can be directly backported.