RM Bug Fixes:

* Fixed up issues seen during QA security knowledge transfer session
  * hard coded "Read" evaluation in DocLib js is overridden in RM to account for "ReadRecord" ... not ideal solution but no other option for the moment
  * property pages now show for non-admin users
  * actions on toolbar showing and hidding correctly when capabilities missing
  * other actions showing and hiding correctly when capabilities missing
  * view details UI action to capability link now working correctly
  * some unit test monkeying
  * gradle scripts have 'explodedDeploy' taget which does deploys content of AMP (or at least what would be the contents of the AMP) to the exploded web apps ... speeds up dev time heaps!



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

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java

@@ -31,7 +31,7 @@ import java.util.Set;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
 import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService;
-import org.alfresco.module.org_alfresco_module_rm.capability.impl.AbstractCapability;
+import org.alfresco.module.org_alfresco_module_rm.capability.AbstractCapability;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionActionDefinition;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/AbstractCapability.java

@@ -16,7 +16,7 @@
  * 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.capability.impl;
+package org.alfresco.module.org_alfresco_module_rm.capability;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,11 +24,6 @@ import java.util.List;
 import net.sf.acegisecurity.vote.AccessDecisionVoter;
 
 import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementAction;
-import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
-import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
-import org.alfresco.module.org_alfresco_module_rm.capability.RMEntryVoter;
-import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
-import org.alfresco.module.org_alfresco_module_rm.capability.RMSecurityCommon;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.security.AccessStatus;

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java

@@ -26,7 +26,7 @@ import net.sf.acegisecurity.vote.AccessDecisionVoter;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.FilePlanComponentKind;
-import org.alfresco.module.org_alfresco_module_rm.capability.impl.AbstractCapability;
+import org.alfresco.module.org_alfresco_module_rm.capability.AbstractCapability;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.security.AccessStatus;
 import org.springframework.beans.BeansException;
@@ -41,7 +41,7 @@ import org.springframework.context.ApplicationContextAware;
 public class DeclarativeCapability extends AbstractCapability implements ApplicationContextAware
 {
     /** Application Context */
-    private ApplicationContext applicationContext;
+    protected ApplicationContext applicationContext;
     
     /** Required permissions */
     private List<String> permissions;
@@ -233,7 +233,7 @@ public class DeclarativeCapability extends AbstractCapability implements Applica
     }
     
     /**
-     * @see org.alfresco.module.org_alfresco_module_rm.capability.impl.AbstractCapability#hasPermissionImpl(org.alfresco.service.cmr.repository.NodeRef)
+     * @see org.alfresco.module.org_alfresco_module_rm.capability.AbstractCapability#hasPermissionImpl(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
     public int evaluate(NodeRef nodeRef)

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FillingCapabilityCondition.java

@@ -18,14 +18,10 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition;
 
-import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition;
-import org.alfresco.service.cmr.dictionary.DictionaryService;
-import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.security.AccessStatus;
-import org.alfresco.service.namespace.QName;
 
 /**
  * Filling capability condition.
@@ -34,17 +30,6 @@ import org.alfresco.service.namespace.QName;
  */
 public class FillingCapabilityCondition extends AbstractCapabilityCondition
 {
-    /** Dictionary service */
-    private DictionaryService dictionaryService;
-    
-    /**
-     * @param dictionaryService     dictionary service
-     */
-    public void setDictionaryService(DictionaryService dictionaryService)
-    {
-        this.dictionaryService = dictionaryService;
-    }    
-    
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
@@ -53,65 +38,11 @@ public class FillingCapabilityCondition extends AbstractCapabilityCondition
     {
         boolean result = false;
         
-        NodeRef filePlan = rmService.getFilePlan(nodeRef);
-        
-        if (permissionService.hasPermission(filePlan, RMPermissionModel.ROLE_ADMINISTRATOR) == AccessStatus.ALLOWED)
+        if (permissionService.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS) != AccessStatus.DENIED)
         {
             result = true;
         }
-        else
-        {
-            QName nodeType = nodeService.getType(nodeRef);
-            if (rmService.isRecord(nodeRef) == true ||
-                dictionaryService.isSubClass(nodeType, ContentModel.TYPE_CONTENT) == true)
-            {
-                // Multifiling - if you have filing rights to any of the folders in which the record resides
-                // then you have filing rights.
-                for (ChildAssociationRef car : nodeService.getParentAssocs(nodeRef))
-                {
-                    if (car != null)
-                    {
-                        if (permissionService.hasPermission(car.getParentRef(), RMPermissionModel.FILE_RECORDS) == AccessStatus.ALLOWED)
-                        {
-                            result = true;
-                            break;
-                        }
-                    }
-                }                
-            }
-            else if (rmService.isRecordFolder(nodeRef) == true)
-            {
-                if (permissionService.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS) != AccessStatus.DENIED)
-                {
-                    result = true;
-                }
-            }
-            else if (rmService.isRecordCategory(nodeRef) == true)
-            {
-                if (permissionService.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS) != AccessStatus.DENIED)
-                {
-                    result = true;
-                }
-                else if (permissionService.hasPermission(filePlan, RMPermissionModel.CREATE_MODIFY_DESTROY_FOLDERS) != AccessStatus.DENIED)
-                {
-                    result = true;
-                }
-            }
-            // else other file plan component
-            else
-            {
-                if (permissionService.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS) != AccessStatus.DENIED)
-                {
-                    result = true;
-                }
-                else if (permissionService.hasPermission(filePlan, RMPermissionModel.CREATE_MODIFY_DESTROY_FILEPLAN_METADATA) != AccessStatus.DENIED)
-                {
-                    result = true;
-                }
-            }
-
-        }
         
-        return result;
+        return result;     
     }
 }

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/group/DeclareCapability.java

@@ -20,9 +20,9 @@ package org.alfresco.module.org_alfresco_module_rm.capability.group;
 
 import net.sf.acegisecurity.vote.AccessDecisionVoter;
 
+import org.alfresco.module.org_alfresco_module_rm.capability.AbstractCapability;
 import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
-import org.alfresco.module.org_alfresco_module_rm.capability.impl.AbstractCapability;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/group/DeleteCapability.java

@@ -20,9 +20,9 @@ package org.alfresco.module.org_alfresco_module_rm.capability.group;
 
 import net.sf.acegisecurity.vote.AccessDecisionVoter;
 
+import org.alfresco.module.org_alfresco_module_rm.capability.AbstractCapability;
 import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
-import org.alfresco.module.org_alfresco_module_rm.capability.impl.AbstractCapability;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/group/UpdateCapability.java

@@ -23,8 +23,8 @@ import java.util.Map;
 
 import net.sf.acegisecurity.vote.AccessDecisionVoter;
 
+import org.alfresco.module.org_alfresco_module_rm.capability.AbstractCapability;
 import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
-import org.alfresco.module.org_alfresco_module_rm.capability.impl.AbstractCapability;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/group/UpdatePropertiesCapability.java

@@ -23,8 +23,8 @@ import java.util.Map;
 
 import net.sf.acegisecurity.vote.AccessDecisionVoter;
 
+import org.alfresco.module.org_alfresco_module_rm.capability.AbstractCapability;
 import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
-import org.alfresco.module.org_alfresco_module_rm.capability.impl.AbstractCapability;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/ChangeOrDeleteReferencesCapability.java

@@ -41,7 +41,7 @@ public class ChangeOrDeleteReferencesCapability extends DeclarativeCapability
     }
     
     /**
-     * @see org.alfresco.module.org_alfresco_module_rm.capability.impl.AbstractCapability#evaluate(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.repository.NodeRef)
+     * @see org.alfresco.module.org_alfresco_module_rm.capability.AbstractCapability#evaluate(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.repository.NodeRef)
      */
     public int evaluate(NodeRef source, NodeRef target)
     {

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/DeleteLinksCapability.java

@@ -41,7 +41,7 @@ public class DeleteLinksCapability extends DeclarativeCapability
     }
 
     /**
-     * @see org.alfresco.module.org_alfresco_module_rm.capability.impl.AbstractCapability#evaluate(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.repository.NodeRef)
+     * @see org.alfresco.module.org_alfresco_module_rm.capability.AbstractCapability#evaluate(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.repository.NodeRef)
      */
     public int evaluate(NodeRef source, NodeRef target)
     {

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/EditRecordMetadataCapability.java

@@ -31,17 +31,17 @@ import org.alfresco.service.cmr.security.OwnableService;
  * 
  * @author Roy Wetherall
  */
-public class EditRecordMetadataCapability extends DeclarativeCapability
+public class EditRecordMetadataCapability extends DeclarativeCapability 
 {
-    /** Ownable service */
     private OwnableService ownableService;
-    
-    /**
-     * @param ownableService    ownable service
-     */
-    public void setOwnableService(OwnableService ownableService)
+
+    private OwnableService getOwnableService()
     {
-        this.ownableService = ownableService;
+        if (ownableService == null)
+        {
+            ownableService = (OwnableService)applicationContext.getBean("OwnableService");
+        }
+        return ownableService;
     }
     
     /**
@@ -76,11 +76,11 @@ public class EditRecordMetadataCapability extends DeclarativeCapability
                                 
                             // Since we know this is undeclared if you are the owner then you should be able to 
                             // edit the records meta-data (otherwise how can it be declared by the user?)
-                            if (ownableService.hasOwner(nodeRef) == true)
+                            if (getOwnableService().hasOwner(nodeRef) == true)
                             {
                                 String user = AuthenticationUtil.getFullyAuthenticatedUser();
                                 if (user != null &&
-                                    ownableService.getOwner(nodeRef).equals(user) == true)
+                                    getOwnableService().getOwner(nodeRef).equals(user) == true)
                                 {
                                     result = Integer.valueOf(AccessDecisionVoter.ACCESS_GRANTED);
                                 }