RM-757: Permission confusion after upgrade from 1.0

RM-753: Can't edit former seria untill it's vital



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0@52262 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml

@@ -677,7 +677,6 @@
             <property name="rma:reviewPeriod">
                <title>Review Period</title>
                <type>d:period</type>
-               <mandatory>true</mandatory>
                <default>none|0</default>
             </property>
             <property name="rma:vitalRecordIndicator">

rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml

@@ -46,6 +46,8 @@
        <property name="nodeService" ref="NodeService"/>
        <property name="recordsManagementService" ref="RecordsManagementService" />
        <property name="behaviourFilter" ref="policyBehaviourFilter"/>
+       <property name="permissionService" ref="PermissionService"/>
+       <property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
    </bean>
 
 </beans>

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilter.java

@@ -113,11 +113,20 @@ public class RecordsManagementTypeFormFilter extends RecordsManagementFormFilter
         for (FieldDefinition fieldDef : fieldDefs)
         {
             String prefixName = fieldDef.getName();                       
-            if (prefixName.equals("rma:identifier"))
+            if (prefixName.equals("rma:identifier") == true)
             {
                 String defaultId = identifierService.generateIdentifier(typeName, null);                
                 fieldDef.setDefaultValue(defaultId);
             }
+            // NOTE: we set these defaults in the form for backwards compatibility reasons (RM-753)
+            else if (prefixName.equals("rma:vitalRecordIndicator") == true)
+            {
+                fieldDef.setDefaultValue(Boolean.FALSE.toString());
+            }
+            else if (prefixName.equals("rma:reviewPeriod") == true)
+            {
+                fieldDef.setDefaultValue("none|0");
+            }
         }
     }
 

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2FilePlanNodeRefPatch.java

@@ -18,11 +18,16 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.patch;
 
+import java.io.Serializable;
 import java.util.List;
 
+import org.alfresco.module.org_alfresco_module_rm.FilePlanComponentKind;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
+import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
+import org.alfresco.module.org_alfresco_module_rm.security.RecordsManagementSecurityService;
+import org.alfresco.module.org_alfresco_module_rm.security.Role;
 import org.alfresco.repo.domain.node.NodeDAO;
 import org.alfresco.repo.domain.patch.PatchDAO;
 import org.alfresco.repo.domain.qname.QNameDAO;
@@ -30,6 +35,8 @@ import org.alfresco.repo.module.AbstractModuleComponent;
 import org.alfresco.repo.policy.BehaviourFilter;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Period;
+import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.Pair;
 import org.apache.commons.logging.Log;
@@ -53,6 +60,8 @@ public class RMv2FilePlanNodeRefPatch extends AbstractModuleComponent
     private PatchDAO patchDAO;
     private NodeDAO nodeDAO;
     private QNameDAO qnameDAO;
+    private PermissionService permissionService;
+    private RecordsManagementSecurityService recordsManagementSecurityService;
     
     public void setNodeService(NodeService nodeService)
     {
@@ -84,6 +93,22 @@ public class RMv2FilePlanNodeRefPatch extends AbstractModuleComponent
         this.qnameDAO = qnameDAO;
     }
     
+    /**
+     * @param recordsManagementSecurityService  records management security service
+     */
+    public void setRecordsManagementSecurityService(RecordsManagementSecurityService recordsManagementSecurityService)
+    {
+        this.recordsManagementSecurityService = recordsManagementSecurityService;
+    }
+    
+    /**
+     * @param permissionService permission service
+     */
+    public void setPermissionService(PermissionService permissionService)
+    {
+        this.permissionService = permissionService;
+    }
+    
     /**
      * @see org.alfresco.repo.module.AbstractModuleComponent#executeInternal()
      */
@@ -98,24 +123,53 @@ public class RMv2FilePlanNodeRefPatch extends AbstractModuleComponent
         Pair<Long, QName> aspectPair = qnameDAO.getQName(ASPECT_FILE_PLAN_COMPONENT);
         if (aspectPair != null)
         {
-            List<Long> records = patchDAO.getNodesByAspectQNameId(aspectPair.getFirst(), 0L, patchDAO.getMaxAdmNodeID());
+            List<Long> filePlanComponents = patchDAO.getNodesByAspectQNameId(aspectPair.getFirst(), 0L, patchDAO.getMaxAdmNodeID());
     
             if (logger.isDebugEnabled() == true)
             {
-                logger.debug("   ... updating " + records.size() + " items" );
+                logger.debug("   ... updating " + filePlanComponents.size() + " items" );
             }
             
             behaviourFilter.disableBehaviour();
             try
             {
-                for (Long record : records)
+                for (Long filePlanComponent : filePlanComponents)
                 {
-                    Pair<Long, NodeRef> recordPair = nodeDAO.getNodePair(record);
+                    Pair<Long, NodeRef> recordPair = nodeDAO.getNodePair(filePlanComponent);
-                    NodeRef recordNodeRef = recordPair.getSecond();
+                    NodeRef filePlanComponentNodeRef = recordPair.getSecond();
                     
-                    if (nodeService.getProperty(recordNodeRef, PROP_ROOT_NODEREF) == null)
+                    NodeRef filePlan =  recordsManagementService.getFilePlan(filePlanComponentNodeRef);
+                    
+                    // set the file plan node reference
+                    if (nodeService.getProperty(filePlanComponentNodeRef, PROP_ROOT_NODEREF) == null)
                     {
-                       nodeService.setProperty(recordNodeRef, PROP_ROOT_NODEREF, recordsManagementService.getFilePlan(recordNodeRef));
+                       nodeService.setProperty(filePlanComponentNodeRef, PROP_ROOT_NODEREF, filePlan);
+                    }                    
+                    
+                    // only set the rmadmin permissions on record categories, record folders and records
+                    FilePlanComponentKind kind = recordsManagementService.getFilePlanComponentKind(filePlanComponentNodeRef);
+                    if (FilePlanComponentKind.RECORD_CATEGORY.equals(kind) == true ||
+                        FilePlanComponentKind.RECORD_FOLDER.equals(kind) == true ||
+                        FilePlanComponentKind.RECORD.equals(kind) == true )
+                    {
+                        // ensure the that the records management role has read and file on the node
+                        Role adminRole = recordsManagementSecurityService.getRole(filePlan, "Administrator");
+                        if (adminRole != null)
+                        {
+                            permissionService.setPermission(filePlanComponentNodeRef, adminRole.getRoleGroupName(), RMPermissionModel.FILING, true);
+                        }
+                        
+                        // ensure that the default vital record default values have been set (RM-753)
+                        Serializable vitalRecordIndicator = nodeService.getProperty(filePlanComponentNodeRef, PROP_VITAL_RECORD_INDICATOR);
+                        if (vitalRecordIndicator == null)
+                        {
+                            nodeService.setProperty(filePlanComponentNodeRef, PROP_VITAL_RECORD_INDICATOR, false);
+                        }
+                        Serializable reviewPeriod = nodeService.getProperty(filePlanComponentNodeRef, PROP_REVIEW_PERIOD);
+                        if (reviewPeriod == null)
+                        {
+                            nodeService.setProperty(filePlanComponentNodeRef, PROP_REVIEW_PERIOD, new Period("none|0"));
+                        }
                     }
                 }
             }

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java

@@ -68,7 +68,15 @@ public class BroadcastVitalRecordDefinitionAction extends RMActionExecuterAbstra
     private void propagateChangeToChildrenOf(NodeRef actionedUponNodeRef)
     {
         Map<QName, Serializable> parentProps = nodeService.getProperties(actionedUponNodeRef);
-        boolean parentVri = (Boolean) parentProps.get(PROP_VITAL_RECORD_INDICATOR);
+        
+        // parent vital record indicator, default to null if not set
+        boolean parentVri = false;
+        Boolean parentVriValue = (Boolean) parentProps.get(PROP_VITAL_RECORD_INDICATOR);
+        if (parentVriValue != null)
+        {
+            parentVri = parentVriValue.booleanValue();
+        }
+        
         Period parentReviewPeriod = (Period) parentProps.get(PROP_REVIEW_PERIOD);
 
         List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(actionedUponNodeRef, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordDefinitionImpl.java

@@ -63,6 +63,10 @@ public class VitalRecordDefinitionImpl implements VitalRecordDefinition, Records
     /* package */ static VitalRecordDefinition create(NodeService nodeService, NodeRef nodeRef)
     {
         Boolean enabled = (Boolean)nodeService.getProperty(nodeRef, PROP_VITAL_RECORD_INDICATOR);
+        if (enabled == null)
+        {
+            enabled = Boolean.FALSE;
+        }
         Period reviewPeriod = (Period)nodeService.getProperty(nodeRef, PROP_REVIEW_PERIOD);
         return new VitalRecordDefinitionImpl(enabled, reviewPeriod);
     }