Commit 2c965653 authored 1 month ago by Marius Dumitru Florea

XWIKI-21155: Allow sorting by specified field for Document Tree macro

* Add support for sorting the document tree by page name, title, last modification date and creation date, both ascending and descending, through the sortDocumentsBy macro parameter
* Add support for sorting the children tree through the sort macro parameter

(cherry picked from commit 09cccdb7)

parent e31d186c

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/AllIT.java 6 additions, 0 deletions

...ker/src/test/it/org/xwiki/index/test/ui/docker/AllIT.java
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/DocumentTreeMacroIT.java 208 additions, 0 deletions

...t/org/xwiki/index/test/ui/docker/DocumentTreeMacroIT.java
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/pom.xml 29 additions, 1 deletion

...platform-index-tree/xwiki-platform-index-tree-api/pom.xml
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/src/main/java/org/xwiki/index/tree/internal/macro/DocumentSort.java 76 additions, 0 deletions

...ava/org/xwiki/index/tree/internal/macro/DocumentSort.java
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/src/main/java/org/xwiki/index/tree/internal/macro/DocumentSortConverter.java 73 additions, 0 deletions

...wiki/index/tree/internal/macro/DocumentSortConverter.java
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/src/main/java/org/xwiki/index/tree/internal/nestedpages/ChildDocumentsTreeNodeGroup.java 71 additions, 25 deletions

...ree/internal/nestedpages/ChildDocumentsTreeNodeGroup.java
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/src/main/java/org/xwiki/index/tree/internal/nestedpages/pinned/PinnedChildPagesListener.java 10 additions, 5 deletions

...internal/nestedpages/pinned/PinnedChildPagesListener.java
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/src/main/java/org/xwiki/index/tree/internal/nestedpages/query/ChildPageFilter.java 4 additions, 1 deletion

...ndex/tree/internal/nestedpages/query/ChildPageFilter.java
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/src/main/java/org/xwiki/index/tree/internal/nestedpages/query/TopLevelPageFilter.java 1 addition, 1 deletion

...x/tree/internal/nestedpages/query/TopLevelPageFilter.java
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/src/main/java/org/xwiki/index/tree/internal/nestedspaces/SpaceTreeNode.java 8 additions, 2 deletions

...xwiki/index/tree/internal/nestedspaces/SpaceTreeNode.java
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/src/main/resources/META-INF/components.txt 2 additions, 0 deletions

...index-tree-api/src/main/resources/META-INF/components.txt
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/src/main/resources/org/xwiki/index/tree/internal/nestedpages/query/queries.hbm.xml.vm 71 additions, 7 deletions

.../index/tree/internal/nestedpages/query/queries.hbm.xml.vm
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/src/main/resources/templates/html_displayer/documentsort/edit.vm 61 additions, 0 deletions

...n/resources/templates/html_displayer/documentsort/edit.vm
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/src/test/java/org/xwiki/index/tree/internal/macro/DocumentSortConverterTest.java 81 additions, 0 deletions

.../index/tree/internal/macro/DocumentSortConverterTest.java
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/src/test/java/org/xwiki/index/tree/internal/nestedpages/ChildDocumentsTreeNodeGroupTest.java 18 additions, 8 deletions

...internal/nestedpages/ChildDocumentsTreeNodeGroupTest.java
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/src/test/java/org/xwiki/index/tree/internal/nestedpages/pinned/PinnedChildPagesListenerTest.java 8 additions, 2 deletions

...rnal/nestedpages/pinned/PinnedChildPagesListenerTest.java
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-macro/src/main/resources/XWiki/ChildrenMacro.xml 100 additions, 3 deletions

...dex-tree-macro/src/main/resources/XWiki/ChildrenMacro.xml
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-macro/src/main/resources/XWiki/DocumentTree.xml 403 additions, 46 deletions

...ndex-tree-macro/src/main/resources/XWiki/DocumentTree.xml
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-macro/src/main/resources/XWiki/DocumentTreeMacros.xml 10 additions, 4 deletions

...ree-macro/src/main/resources/XWiki/DocumentTreeMacros.xml
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-macro/src/main/resources/XWiki/DocumentTreeTranslations.xml 15 additions, 1 deletion

...cro/src/main/resources/XWiki/DocumentTreeTranslations.xml

with 1255 additions and 106 deletions

Please register or to comment