From edd4727b9ae8171bedf1ede8aaa899bbbe8f9058 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@googlemail.com>
Date: Thu, 13 Jul 2023 21:14:03 +0200
Subject: [PATCH] Some bugfixes for FixItemPermissions tool

---
 ...igurationFixItemPermissionsController.java | 46 +------------------
 .../FixItemPermissionsTaskManager.java        |  9 ++--
 .../librecms/CmsAdminMessages_de.properties   |  2 +-
 3 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationFixItemPermissionsController.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationFixItemPermissionsController.java
index a13f603df..8363561f9 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationFixItemPermissionsController.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationFixItemPermissionsController.java
@@ -55,8 +55,6 @@ public class ConfigurationFixItemPermissionsController {
     @Inject
     private AdminPermissionsChecker adminPermissionsChecker;
 
-//    @Inject
-//    private ContentSectionManager sectionManager;
     @Inject
     private ContentSectionModel sectionModel;
 
@@ -66,13 +64,9 @@ public class ConfigurationFixItemPermissionsController {
     @Inject
     private ContentSectionsUi sectionsUi;
 
-//    @Inject
-//    private PermissionManager permissionManager;
-//    
-    
     @Inject
     private FixItemPermissionsTaskManager taskManager;
-    
+
     @POST
     @Path("/")
     @AuthorizationRequired
@@ -93,9 +87,6 @@ public class ConfigurationFixItemPermissionsController {
             );
         }
 
-//        fixContentItemPermissions(section.getRootDocumentsFolder());
-//        fixAssetPermissions(section.getRootAssetsFolder());
-
         taskManager.fixItemPermissions(section);
 
         return String.format(
@@ -103,39 +94,4 @@ public class ConfigurationFixItemPermissionsController {
         );
     }
 
-//    private void fixContentItemPermissions(final Folder folder) {
-//        final List<ContentItem> items = folder
-//            .getObjects()
-//            .stream()
-//            .map(Categorization::getCategorizedObject)
-//            .filter(obj -> obj instanceof ContentItem)
-//            .map(obj -> (ContentItem) obj)
-//            .collect(Collectors.toList());
-//        
-//        for(final ContentItem item : items) {
-//            permissionManager.copyPermissions(folder, item, true);
-//        }
-//        
-//        for(final Folder subFolder : folder.getSubFolders()) {
-//            fixContentItemPermissions(subFolder);
-//        }
-//    }
-//    
-//    private void fixAssetPermissions(final Folder folder) {
-//        final List<Asset> assets = folder
-//            .getObjects()
-//            .stream()
-//            .map(Categorization::getCategorizedObject)
-//            .filter(obj -> obj instanceof Asset)
-//            .map(obj -> (Asset) obj)
-//            .collect(Collectors.toList());
-//        
-//        for(final Asset asset : assets) {
-//            permissionManager.copyPermissions(folder, asset, true);
-//        }
-//        
-//        for(final Folder subFolder : folder.getSubFolders()) {
-//            fixAssetPermissions(subFolder);
-//        }
-//    }
 }
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/FixItemPermissionsTaskManager.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/FixItemPermissionsTaskManager.java
index 1a1c6e541..52362478d 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/FixItemPermissionsTaskManager.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/FixItemPermissionsTaskManager.java
@@ -113,10 +113,12 @@ public class FixItemPermissionsTaskManager {
         tasks.removeAll(
             tasks
                 .stream()
-                .filter(task -> task.getStatus()
+                .filter(
+                    task -> task.getStatus()
                                 == FixItemPermissionsStatus.ERROR
-                                    || task.getStatus()
-                                       == FixItemPermissionsStatus.FINISHED)
+                                || task.getStatus()
+                                       == FixItemPermissionsStatus.FINISHED
+                )
                 .collect(Collectors.toSet())
         );
 
@@ -134,6 +136,7 @@ public class FixItemPermissionsTaskManager {
         ).handle((task, ex) -> handleTaskResult(task, ex, taskStatus));
 
         taskStatus.setStatus(FixItemPermissionsStatus.RUNNING);
+        tasks.add(taskStatus);
     }
 
     private Object handleTaskResult(
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 9b749cb2e..21a88f48d 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties
@@ -1033,5 +1033,5 @@ pages.page.details.displayname.edit=Display Name bearbeiten
 pages.page.details.dialog.displayname.label=Display Name
 contentsection.configuration.fixitemandassetspermissions.title=Berechtigungen reparieren
 contentsection.configuration.fixitemandassetspermissions.description=Repariert die Berechtigungen f\u00fcr Dokumente und Assets
-contentsection.configuration.fixitemandassetspermissions.running=Repariere Berechtigungen f\u00fcr Dokumente und Assets 
+contentsection.configuration.fixitemandassetspermissions.running=Repariere Berechtigungen f\u00fcr Dokumente und Assets...
 contentsection.configuration.fixitemandassetspermissions.failed=Reparieren der Berechtigungen f\u00fcr Dokumente und Assets fehlgeschlagen. Weitere Informationen im Log.