From e02818620168177504e09d103d2519b170f84b6c Mon Sep 17 00:00:00 2001 From: Sofien Haj Chedhli Date: Tue, 26 Mar 2024 14:21:56 +0100 Subject: [PATCH] feat: Allow to create a root note page other that the homepage - EXO-70331 - Meeds-io/MIPs#119 This change is going to allow to create a root note page other that the homepage . --- .../main/java/org/exoplatform/wiki/jpa/JPADataStorage.java | 2 +- .../org/exoplatform/wiki/service/impl/NoteServiceImpl.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/notes-service/src/main/java/org/exoplatform/wiki/jpa/JPADataStorage.java b/notes-service/src/main/java/org/exoplatform/wiki/jpa/JPADataStorage.java index 1cdc5b6638..0ad6917299 100644 --- a/notes-service/src/main/java/org/exoplatform/wiki/jpa/JPADataStorage.java +++ b/notes-service/src/main/java/org/exoplatform/wiki/jpa/JPADataStorage.java @@ -214,7 +214,7 @@ public Page createPage(Wiki wiki, Page parentPage, Page page) throws WikiExcepti PageEntity createdPageEntity = pageDAO.create(pageEntity); // if the page to create is the Home, update the wiki - if (parentPage == null) { + if (parentPage == null && NoteConstants.NOTE_HOME_NAME.equals(createdPageEntity.getName())) { wikiEntity.setWikiHome(createdPageEntity); wikiDAO.update(wikiEntity); } diff --git a/notes-service/src/main/java/org/exoplatform/wiki/service/impl/NoteServiceImpl.java b/notes-service/src/main/java/org/exoplatform/wiki/service/impl/NoteServiceImpl.java index 36ec9d3788..c16fc2764c 100644 --- a/notes-service/src/main/java/org/exoplatform/wiki/service/impl/NoteServiceImpl.java +++ b/notes-service/src/main/java/org/exoplatform/wiki/service/impl/NoteServiceImpl.java @@ -227,7 +227,9 @@ public Page createNote(Wiki noteBook, Page parentPage, Page note) throws WikiExc createdPage.setAppName(note.getAppName()); createdPage.setUrl(Utils.getPageUrl(createdPage)); createdPage.setLang(note.getLang()); - invalidateCache(parentPage); + if (parentPage != null) { + invalidateCache(parentPage); + } invalidateCache(note); Utils.broadcast(listenerService, "note.posted", note.getAuthor(), createdPage);