RM-1799 (Root category is not displayed for the non-rm-admin user who created it)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@92881 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java

@@ -43,6 +43,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.security.AccessPermission;
+import org.alfresco.service.cmr.security.AccessStatus;
 import org.alfresco.service.cmr.security.AuthorityService;
 import org.alfresco.service.cmr.security.AuthorityType;
 import org.alfresco.service.cmr.security.OwnableService;
@@ -294,6 +295,28 @@ public class FilePlanPermissionServiceImpl extends    ServiceBaseImpl
                     // remove owner
                     getOwnableService().setOwner(nodeRef, NO_OWNER);
 
+                    if (isParentNodeFilePlan)
+                    {
+                        Set<AccessPermission> perms = permissionService.getAllSetPermissions(parent);
+                        for (AccessPermission perm : perms)
+                        {
+                            if (RMPermissionModel.FILING.equals(perm.getPermission()))
+                            {
+                                AccessStatus accessStatus = perm.getAccessStatus();
+                                boolean allow = false;
+                                if (AccessStatus.ALLOWED.equals(accessStatus))
+                                {
+                                    allow = true;
+                                }
+                                permissionService.setPermission(
+                                        nodeRef,
+                                        perm.getAuthority(),
+                                        perm.getPermission(),
+                                        allow);
+                            }
+                        }
+                    }
+
                     return null;
                 }
             });

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java

@@ -41,7 +41,8 @@ import org.junit.runners.Suite.SuiteClasses;
     RM452Test.class,
     RM804Test.class,
     RM994Test.class,
-    RM1039Test.class
+    RM1039Test.class,
+    RM1799Test.class
 })
 public class IssueTestSuite
 {

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1799Test.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2005-2015 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm.test.integration.issue;
+
+import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
+import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
+import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.util.GUID;
+
+/**
+ * Test for RM-1799
+ *
+ * @author Tuna Aksoy
+ * @since 2.3
+ */
+public class RM1799Test extends BaseRMTestCase
+{
+    private String myUser;
+    private NodeRef category;
+
+    @Override
+    protected boolean isRecordTest()
+    {
+        return true;
+    }
+
+    @Override
+    protected boolean isUserTest()
+    {
+        return true;
+    }
+
+    @Override
+    protected void setupTestUsersImpl(NodeRef filePlan)
+    {
+        super.setupTestUsersImpl(filePlan);
+
+        myUser = GUID.generate();
+        createPerson(myUser);
+        filePlanRoleService.assignRoleToAuthority(filePlan, FilePlanRoleService.ROLE_RECORDS_MANAGER, myUser);
+    }
+
+    public void testRM1799() throws Exception
+    {
+        doTestInTransaction(new Test<Void>()
+        {
+            @Override
+            public Void run()
+            {
+                filePlanPermissionService.setPermission(filePlan, myUser, RMPermissionModel.FILING);
+                return null;
+            }
+        }, ADMIN_USER);
+
+        doTestInTransaction(new Test<Void>()
+        {
+            @Override
+            public Void run()
+            {
+                category = filePlanService.createRecordCategory(filePlan, GUID.generate());
+                return null;
+            }
+        }, myUser);
+
+        doTestInTransaction(new Test<Void>()
+        {
+            @Override
+            public Void run()
+            {
+                assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(category, RMPermissionModel.FILING));
+                return null;
+            }
+        }, myUser);
+    }
+}