Skip to content

Backport - MEED-10215, MEED-10246 #1627

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.

Sign up for GitHub

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

Merged
hakermi merged 2 commits into from
Feb 17, 2026
Merged

Backport - MEED-10215, MEED-10246 #1627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c052231
fix: Breadcrumb displayed title not updated when restore a version - …
hakermi Feb 12, 2026
8e27583
fix: Toc displayed title not updated when restore a version - MEED-10…
hakermi Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions notes-service/src/main/java/org/exoplatform/wiki/service/impl/NoteServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2077,14 +2077,15 @@ private List<BreadcrumbData> getBreadCrumb(List<BreadcrumbData> list,

private String getNoteTitleWithTraduction(Page note, Identity userIdentity, String source, String lang) throws WikiException,
IllegalAccessException {
if (userIdentity == null || StringUtils.isEmpty(lang)) {
if (userIdentity == null) {
return note.getTitle();
}
Page page = getNoteByIdAndLang(Long.valueOf(note.getId()), userIdentity, source, lang);
if (page != null) {
if (page != null && page.getLang() != null) {
return page.getTitle();
}
return note.getTitle();
Page publishedVersion = getPublishedVersionByPageIdAndLang(Long.valueOf(note.getId()), null);
return Objects.requireNonNullElse(publishedVersion, note).getTitle();
}

private String getDraftNameSuffix(long clientTime) {
Expand Down
1 change: 1 addition & 0 deletions notes-service/src/main/java/org/exoplatform/wiki/storage/EntityConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ public static PageHistory convertPageVersionEntityToPageHistory(PageVersionEntit
pageHistory.setUpdatedDate(pageVersionEntity.getUpdatedDate());
pageHistory.setLang(pageVersionEntity.getLang());
pageHistory.setTitle(pageVersionEntity.getTitle());
pageHistory.setName(pageVersionEntity.getName());
buildNotePageMetadata(pageHistory, false, String.valueOf(pageVersionEntity.getPage().getId()));
if (StringUtils.isNotBlank(pageHistory.getAuthor())) {
Identity identity = ExoContainerContext.getService(IdentityManager.class)
Expand Down
7 changes: 6 additions & 1 deletion notes-service/src/main/java/org/exoplatform/wiki/tree/utils/TreeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,13 @@ private static void encodeWikiTreeNode(JsonNodeData nodeData, Locale locale, Ide
} else {
if (!nodeData.isDraftPage()) {
Page page = noteService.getNoteByIdAndLang(Long.valueOf(nodeData.getNoteId()), identity, "", locale.getLanguage());
if (page != null) {
if (page != null && page.getLang() != null) {
nodeData.setName(page.getTitle());
return;
}
Page publishedVersion = noteService.getPublishedVersionByPageIdAndLang(Long.valueOf(nodeData.getNoteId()), null);
if (publishedVersion != null) {
nodeData.setName(publishedVersion.getTitle());
}
}
}
Expand Down
1 change: 1 addition & 0 deletions notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,6 +1057,7 @@ export default {
restoreVersion(version) {
const note = {
id: this.note.id,
name: version.name,
title: version.title,
content: version.content,
updatedDate: version.updatedDate,
Expand Down