Skip to content

Extended folder to have more meta-data #747

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.

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,9 @@ public class Folder extends HasIdAndAuditing {
@Nullable
private String parentFolderId; // null represents folder in the root folder
private String name;
private String title;
private String description;
private String category;
private String type;
private String image;
}
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,11 @@ private Mono<Void> removePermissions(String folderId) {
public Mono<FolderInfoView> update(Folder folder) {
Folder newFolder = new Folder();
newFolder.setName(folder.getName());
newFolder.setTitle(folder.getTitle());
newFolder.setType(folder.getType());
newFolder.setCategory(folder.getCategory());
newFolder.setDescription(folder.getDescription());
newFolder.setImage(folder.getImage());
return checkManagePermission(folder.getId())
.then(folderService.updateById(folder.getId(), newFolder))
.then(folderService.findById(folder.getId()))
Expand Down Expand Up @@ -421,6 +426,10 @@ public Mono<FolderInfoView> buildFolderInfoView(Folder folder, boolean visible,
.folderId(folder.getId())
.parentFolderId(folder.getParentFolderId())
.name(folder.getName())
.description(folder.getDescription())
.category(folder.getCategory())
.type(folder.getType())
.image(folder.getImage())
.createAt(folder.getCreatedAt() == null ? 0 : folder.getCreatedAt().toEpochMilli())
.createBy(user.getName())
.createTime(folder.getCreatedAt())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ public class FolderInfoView {
private final String folderId;
private final String parentFolderId;
private final String name;
private final String title;
private final String description;
private final String category;
private final String type;
private final String image;
private final Long createAt;
private final String createBy;
private boolean isVisible;
Expand Down