Skip to content

IBX-6773: Merged branch '4.6' into 5.0 - #832

Closed
vidarl wants to merge 4 commits into
5.0from
merge/4.6-to-5.0
Closed

vidarl wants to merge 4 commits into
5.0from
merge/4.6-to-5.0

Conversation

@vidarl

@vidarl vidarl commented Sep 16, 2026

Copy link
Copy Markdown
Contributor

Caution

This is a merge pull request

🎫 Issue IBX-6773

Related PRs:

vidarl and others added 2 commits September 16, 2026 09:56
)

For more details see https://ibexa.atlassian.net/browse/IBX-6773 and #476

Key changes:

* Fixed `BookmarkService::loadBookmarks()` throwing an exception when the bookmark list contained locations the current user no longer has access to, by resolving bookmarks through filtering instead of `LocationService::loadLocation()`.

* Extended `Criterion\Location\IsBookmarked` to support filtering via both `LocationService::find()`/`count()` and `ContentService::find()` (matching main Locations only for Content filtering).

* Added `SortClause\Location\Bookmark\Id` and its query builders to allow sorting filtered bookmark results by recency.

* Deprecated `Handler::loadUserBookmarks()`, `Handler::countUserBookmarks()` and their Gateway counterparts in favor of `LocationService::find()`/`count()` with `Criterion\Location\IsBookmarked`.

* Made `BookmarkService` log and return an empty list instead of failing when the underlying filter query throws a repository exception.

---------

Co-Authored-By: Paweł Niedzielski <3183926+Steveb-p@users.noreply.github.com>
Co-Authored-By: Andrew Longosz <7099219+alongosz@users.noreply.github.com>
@vidarl vidarl added the Fast-forward merge PR should be merged in a fast-forward way label Sep 16, 2026
@sonarqubecloud

Copy link
Copy Markdown

@vidarl

vidarl commented Sep 16, 2026

Copy link
Copy Markdown
Contributor Author

Superseded by the merge-up landed in b59a4ff, which brought 08c15f9 (IBX-6773) into 5.0 and resolved the same conflicts identically.

@vidarl vidarl closed this Sep 16, 2026
@alongosz
alongosz deleted the merge/4.6-to-5.0 branch September 16, 2026 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Fast-forward merge PR should be merged in a fast-forward way

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant