diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions.properties index ed600db879..aa6200f4bf 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/actions.properties @@ -93,6 +93,9 @@ executeScript.script-ref.display-label=Script # Send Email sendEmail.title=Send email sendEmail.description=Send an email +# Set Property +setPropertyValue.title=Set property value +setPropertyValue.description=Set a property value # Action parameter constraints rm-ac-is-kind-kinds.record_category=Record Category diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml index 1ab6330a90..05e0cf69c1 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml @@ -892,5 +892,22 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CompositeCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CompositeCapability.java index ce923d79a0..f82ecaa57f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CompositeCapability.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CompositeCapability.java @@ -54,6 +54,11 @@ public class CompositeCapability extends DeclarativeCapability // Check each capability using 'OR' logic for (Capability capability : capabilities) { + if (logger.isDebugEnabled() == true) + { + logger.debug("Evaluating child capability " + capability.getName() + " on nodeRef " + nodeRef.toString() + " for composite capability " + name); + } + int capabilityResult = capability.evaluate(nodeRef); if (capabilityResult != AccessDecisionVoter.ACCESS_DENIED) { @@ -64,6 +69,13 @@ public class CompositeCapability extends DeclarativeCapability } break; } + else + { + if (logger.isDebugEnabled() == true) + { + logger.debug("Access denied for child capability " + capability.getName() + " on nodeRef " + nodeRef.toString() + " for composite capability " + name); + } + } } return result;