Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] Do not remove attached media when renaming an API Doc Page #5574

Merged
merged 1 commit into from
Oct 16, 2023
Merged

[master] Do not remove attached media when renaming an API Doc Page #5574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...pim-rest-api-service/src/main/java/io/gravitee/rest/api/service/impl/PageServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,11 @@ private static Page merge(UpdatePageEntity updatePageEntity, Page withUpdatePage
: withUpdatePage.getAccessControls()
);

List<PageMedia> pageMediaList = convertMediaEntity(updatePageEntity.getAttachedMedia());
page.setAttachedMedia(pageMediaList != null ? pageMediaList : withUpdatePage.getAttachedMedia());
page.setAttachedMedia(
updatePageEntity.getAttachedMedia() != null
? convertMediaEntity(updatePageEntity.getAttachedMedia())
: withUpdatePage.getAttachedMedia()
);
page.setParentId(
updatePageEntity.getParentId() != null
? updatePageEntity.getParentId().isEmpty() ? null : updatePageEntity.getParentId()
Expand Down