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.

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

fixed permissions issue for #1253 #2650

Merged
merged 1 commit into from
Nov 4, 2024
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 @@ -927,7 +927,7 @@ public String export(ArchiveFileBean dto, Date lastModified) throws Exception {
List<CaseFolder> hierarchy = new ArrayList<>();
if (db.getFolder() != null) {
if(!folderHierarchies.containsKey(db.getFolder().getId())) {
hierarchy=caseFacade.getFolderHierarchy(db.getFolder().getId());
hierarchy=caseFacade.getFolderHierarchyUnrestricted(db.getFolder().getId());
folderHierarchies.put(db.getFolder().getId(), hierarchy);
}
hierarchy=folderHierarchies.get(db.getFolder().getId());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4560,6 +4560,16 @@ public DocumentFolderTemplate getFolderTemplateById(String id) {
return this.folderTemplateFacade.find(id);
}

/**
* Returns a list of folder representing a hierarchy. First element in the list is the root folder.
* @param folderId
* @return
*/
@Override
public List<CaseFolder> getFolderHierarchyUnrestricted(String folderId) {
return getFolderHierarchyImpl(folderId);
}

/**
* Returns a list of folder representing a hierarchy. First element in the list is the root folder.
* @param folderId
Expand All @@ -4568,6 +4578,10 @@ public DocumentFolderTemplate getFolderTemplateById(String id) {
@Override
@RolesAllowed({"loginRole"})
public List<CaseFolder> getFolderHierarchy(String folderId) {
return getFolderHierarchyImpl(folderId);
}

private List<CaseFolder> getFolderHierarchyImpl(String folderId) {
List<CaseFolder> hierarchy=new ArrayList<>();
if(folderId==null)
return hierarchy;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,7 @@ public interface ArchiveFileServiceLocal {
DocumentFolderTemplate getFolderTemplateById(String id);

List<CaseFolder> getFolderHierarchy(String folderId);
List<CaseFolder> getFolderHierarchyUnrestricted(String folderId);

void purgeDocumentBin() throws Exception;

Expand Down
Loading