From 81a6e93ddb24c5acc89a83daf38a8fc24c7f16bd Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Tue, 26 Jan 2021 21:08:12 +0100 Subject: [PATCH] DocumentFolder entries listing Former-commit-id: 2917078e5533f5df0e674c07116c0a6fd3c05f75 --- .../librecms/ui/ContentSectionController.java | 29 +-- .../org/librecms/ui/DocumentFolderModel.java | 8 + .../librecms/ui/DocumentFolderRowModel.java | 10 +- .../ui/content-section/document-folder.xhtml | 208 +++++++----------- .../org/librecms/CmsAdminMessages.properties | 1 + .../librecms/CmsAdminMessages_de.properties | 1 + 6 files changed, 101 insertions(+), 156 deletions(-) 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 88cb29bb7..3fce2b44b 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/ContentSectionController.java +++ b/ccm-cms/src/main/java/org/librecms/ui/ContentSectionController.java @@ -150,15 +150,12 @@ public class ContentSectionController { ItemPrivileges.EDIT, section.getRootDocumentsFolder() )) { contentSectionModel.setSection(section); - LOGGER.info("Checked in permisisons in {} ms.", System - .currentTimeMillis() - permissionCheckStart); + LOGGER.info( + "Checked in permisisons in {} ms.", + System.currentTimeMillis() - permissionCheckStart + ); final long objectsStart = System.currentTimeMillis(); -// final List objects = folderRepo -// .findObjectsInFolder( -// section.getRootDocumentsFolder(), firstResult, -// maxResults -// ); final List folderEntries = folderRepo .getDocumentFolderEntries( section.getRootDocumentsFolder(), @@ -166,11 +163,11 @@ public class ContentSectionController { maxResults, "" ); - LOGGER.info("Retrieved objects in {} ms", System - .currentTimeMillis() - objectsStart); + LOGGER.info( + "Retrieved objects in {} ms", + System.currentTimeMillis() - objectsStart + ); documentFolderModel.setCount( - // folderRepo - // .countObjectsInFolder(section.getRootDocumentsFolder()) folderRepo.countDocumentFolderEntries( section.getRootDocumentsFolder(), "" ) @@ -183,12 +180,6 @@ public class ContentSectionController { ); final long rowsStart = System.currentTimeMillis(); -// documentFolderModel.setRows( -// objects -// .stream() -// .map(object -> buildRowModel(section, object)) -// .collect(Collectors.toList()) -// ); documentFolderModel.setRows( folderEntries .stream() @@ -320,7 +311,7 @@ public class ContentSectionController { .folderIsDeletable(folder) == FolderManager.FolderIsDeletable.YES ); - row.setIsFolder(true); + row.setFolder(true); row.setLanguages(Collections.emptySortedSet()); row.setLastEditPublished(false); row.setLastEdited(""); @@ -348,7 +339,7 @@ public class ContentSectionController { ) ); row.setDeletable(!itemManager.isLive(contentItem)); - row.setIsFolder(false); + row.setFolder(false); row.setLanguages( new TreeSet<>( itemL10NManager diff --git a/ccm-cms/src/main/java/org/librecms/ui/DocumentFolderModel.java b/ccm-cms/src/main/java/org/librecms/ui/DocumentFolderModel.java index 58a218327..f83431df5 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/DocumentFolderModel.java +++ b/ccm-cms/src/main/java/org/librecms/ui/DocumentFolderModel.java @@ -52,6 +52,14 @@ public class DocumentFolderModel { protected void setMaxResults(final int maxResults) { this.maxResults = maxResults; } + + public long getNumberOfPages() { + return (long) Math.ceil((double) count / maxResults); + } + + public long getCurrentPage() { + return (long) Math.ceil((double) firstResult / maxResults ) + 1; + } public List getRows() { return Collections.unmodifiableList(rows); diff --git a/ccm-cms/src/main/java/org/librecms/ui/DocumentFolderRowModel.java b/ccm-cms/src/main/java/org/librecms/ui/DocumentFolderRowModel.java index f71b78a7b..e3afc3b2b 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/DocumentFolderRowModel.java +++ b/ccm-cms/src/main/java/org/librecms/ui/DocumentFolderRowModel.java @@ -18,7 +18,7 @@ public class DocumentFolderRowModel { private boolean deletable; - private boolean isFolder; + private boolean folder; private SortedSet languages; @@ -50,12 +50,12 @@ public class DocumentFolderRowModel { this.deletable = deletable; } - public boolean isIsFolder() { - return isFolder; + public boolean isFolder() { + return folder; } - protected void setIsFolder(final boolean isFolder) { - this.isFolder = isFolder; + protected void setFolder(final boolean folder) { + this.folder = folder; } public SortedSet getLanguages() { 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 5000e5eeb..ddac3bd39 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 @@ -18,50 +18,9 @@

#{CmsAdminMessages.getMessage("contentsection.documentfolder.heading", [ContentSectionModel.sectionName])}

+
+
+

+ ${CmsAdminMessages.getMessage("contentsection.documentfolder.pageof", [DocumentFolderModel.currentPage, DocumentFolderModel.numberOfPages, DocumentFolderModel.maxResults, DocumentFolderModel.count])} +

+
@@ -142,109 +106,89 @@ - + -
#{row.title} #{row.type}#{row.created}#{row.created} - #{row.lastEdited} - - - - - - - #{CmsAdminMessages['contentsection.documentfolder.cols.lastedit.published']} - - - - - - #{CmsAdminMessages['contentsection.documentfolder.cols.lastedit.unpublished']} - - + + #{row.lastEdited} + + + + + + + #{CmsAdminMessages['contentsection.documentfolder.cols.lastedit.published']} + + + + + + #{CmsAdminMessages['contentsection.documentfolder.cols.lastedit.unpublished']} + + + - +
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties index 612a158f8..fba3a4dd0 100644 --- a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties +++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties @@ -44,3 +44,4 @@ contentsection.documentfolder.pagination.next_page=Next page contentsection.not_found=No content section identifed by {0} available. contentsection.accessdenied=Your are not permitted to access content section {0}. contentsection.documentfolder.types.folder=Folder +contentsection.documentfolder.pageof=Page {0} of {1}. Showing max. {2} of {3} documents per page. diff --git a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties index e80840f16..d483a8b0c 100644 --- a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties +++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties @@ -44,3 +44,4 @@ contentsection.documentfolder.pagination.next_page=Eine Seite weiter contentsection.not_found=Keine Content Section mit dem Identifier {0} gefunden. contentsection.accessdenied=Sind sind nicht berechtigt auf die Content Section {0} zuzugreifen. contentsection.documentfolder.types.folder=Ordner +contentsection.documentfolder.pageof=Seite {0} von {1}. Zeige max. {2} von {3} Dokumenten pro Seite.