From 93a62e163de0d2863deb8c25ca7b8ba385b31c3f Mon Sep 17 00:00:00 2001 From: jensp Date: Thu, 1 Mar 2018 09:53:28 +0000 Subject: [PATCH] CCM NG: Copy permissions from parent folder to new sub folder git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5320 8810af33-2d31-482b-a856-94f89814c4df --- .../contentsection/FolderManager.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/FolderManager.java b/ccm-cms/src/main/java/org/librecms/contentsection/FolderManager.java index aea8e3b3d..80a0e76ad 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/FolderManager.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/FolderManager.java @@ -23,6 +23,7 @@ import com.arsdigita.kernel.KernelConfig; import org.libreccm.categorization.Category; import org.libreccm.categorization.CategoryManager; import org.libreccm.configuration.ConfigurationManager; +import org.libreccm.security.PermissionManager; import java.util.ArrayList; import java.util.Collections; @@ -46,25 +47,28 @@ import javax.transaction.Transactional; public class FolderManager { @Inject - private EntityManager entityManager; - - @Inject - private ConfigurationManager confManager; - - @Inject - private FolderRepository folderRepo; + private AssetManager assetManager; @Inject private CategoryManager categoryManager; @Inject - private ContentItemRepository itemRepo; + private ConfigurationManager confManager; + + @Inject + private EntityManager entityManager; + + @Inject + private FolderRepository folderRepo; @Inject private ContentItemManager itemManager; @Inject - private AssetManager assetManager; + private ContentItemRepository itemRepo; + + @Inject + private PermissionManager permissionManager; /** * An enum describing if a folder can be deleted or not and why. @@ -188,6 +192,7 @@ public class FolderManager { folderRepo.save(folder); categoryManager.addSubCategoryToCategory(folder, parent); + permissionManager.copyPermissions(parent, folder, true); return folder; }