Merge pull request #2650 from jlawyerorg/fixes/3.0.0.1

fixed permissions issue for #1253
jlawyerorg · Nov 4, 2024 · d9709bc · d9709bc
2 parents 876fb82 + c44c36c
commit d9709bc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/export/HTMLExport.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/export/HTMLExport.java
@@ -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());

diff --git a/...rver/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ArchiveFileService.java b/...rver/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ArchiveFileService.java
@@ -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
@@ -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;

diff --git a/...j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ArchiveFileServiceLocal.java b/...j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ArchiveFileServiceLocal.java
@@ -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;