From c9c1025394914495d07fcda3e0e7f00c8b92c725 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 28 Jan 2021 21:13:50 +0100 Subject: [PATCH] Document Folder Tree Former-commit-id: 8b93880488b304b77a1c4af85baa5017a251acb0 --- .../librecms/ui/ContentSectionController.java | 24 +++++-- .../resources/components/cms/treeNode.xhtml | 66 ------------------- .../document-folder-tree-node.xhtml | 46 +++++++++++++ .../ui/content-section/document-folder.xhtml | 12 +++- 4 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 ccm-cms/src/main/resources/META-INF/resources/components/cms/treeNode.xhtml create mode 100644 ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/document-folder-tree-node.xhtml diff --git a/ccm-cms/src/main/java/org/librecms/ui/ContentSectionController.java b/ccm-cms/src/main/java/org/librecms/ui/ContentSectionController.java index 3c6e73891..66664b08c 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/ContentSectionController.java +++ b/ccm-cms/src/main/java/org/librecms/ui/ContentSectionController.java @@ -221,7 +221,10 @@ public class ContentSectionController { System.currentTimeMillis() - objectsStart ); - contentSectionModel.setFolders(buildFolderTree(section, folder)); + final List folderTree = buildFolderTree( + section, folder + ); + contentSectionModel.setFolders(folderTree); final long rowsStart = System.currentTimeMillis(); documentFolderModel.setRows( @@ -355,7 +358,10 @@ public class ContentSectionController { return root .getSubFolders() .stream() - .sorted() + .sorted( + (folder1, folder2) + -> folder1.getName().compareTo(folder2.getName()) + ) .map(folder -> buildFolderTreeNode(section, currentFolderPath, folder)) .collect(Collectors.toList()); @@ -378,16 +384,22 @@ public class ContentSectionController { node.setFolderId(folder.getObjectId()); node.setUuid(folder.getUuid()); node.setName(folder.getName()); + node.setPath(folderPath); node.setOpen(currentFolderPath.startsWith(folderPath)); node.setSelected(currentFolderPath.equals(folderPath)); node.setSubFolders( folder .getSubFolders() .stream() - .sorted() - .map(subFolder -> buildFolderTreeNode(section, - currentFolderPath, - subFolder)) + .sorted( + (folder1, folder2) + -> folder1.getName().compareTo(folder2.getName()) + ) + .map( + subFolder -> buildFolderTreeNode( + section, currentFolderPath, subFolder + ) + ) .collect(Collectors.toList()) ); diff --git a/ccm-cms/src/main/resources/META-INF/resources/components/cms/treeNode.xhtml b/ccm-cms/src/main/resources/META-INF/resources/components/cms/treeNode.xhtml deleted file mode 100644 index 1f1b9a1ce..000000000 --- a/ccm-cms/src/main/resources/META-INF/resources/components/cms/treeNode.xhtml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - -
  • -
    - - #{cc.attrs.name} -
    -
      - - - -
    -
    • -     - -
  • - #{cc.attrs.name} -
    • -     -     -     - diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/document-folder-tree-node.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/document-folder-tree-node.xhtml new file mode 100644 index 000000000..230f0eac2 --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/document-folder-tree-node.xhtml @@ -0,0 +1,46 @@ +]> + + + + +
  • +
    + + #{folder.name} +
    +
      + + + + + + +
    + +
    • +     + +
  • + #{folder.name} +
    • +     +     +     + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/document-folder.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/document-folder.xhtml index 30d4814b4..f4f0042b8 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/document-folder.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/content-section/document-folder.xhtml @@ -51,12 +51,20 @@