From d714cb65a305df4796e6451c18c45c8d5b5fd921 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Thu, 11 Feb 2010 00:00:37 +0000 Subject: [PATCH] Minor changes to action executers: - assoc qname on copy optional - generalClassification aspect set as default category aspect git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/action/executer/CopyActionExecuter.java | 2 +- .../action/executer/LinkCategoryActionExecuter.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/action/executer/CopyActionExecuter.java b/source/java/org/alfresco/repo/action/executer/CopyActionExecuter.java index bb254abc40..84835df115 100644 --- a/source/java/org/alfresco/repo/action/executer/CopyActionExecuter.java +++ b/source/java/org/alfresco/repo/action/executer/CopyActionExecuter.java @@ -97,7 +97,7 @@ public class CopyActionExecuter extends ActionExecuterAbstractBase { paramList.add(new ParameterDefinitionImpl(PARAM_DESTINATION_FOLDER, DataTypeDefinition.NODE_REF, true, getParamDisplayLabel(PARAM_DESTINATION_FOLDER))); paramList.add(new ParameterDefinitionImpl(PARAM_ASSOC_TYPE_QNAME, DataTypeDefinition.QNAME, true, getParamDisplayLabel(PARAM_ASSOC_TYPE_QNAME))); - paramList.add(new ParameterDefinitionImpl(PARAM_ASSOC_QNAME, DataTypeDefinition.QNAME, true, getParamDisplayLabel(PARAM_ASSOC_QNAME))); + paramList.add(new ParameterDefinitionImpl(PARAM_ASSOC_QNAME, DataTypeDefinition.QNAME, false, getParamDisplayLabel(PARAM_ASSOC_QNAME))); paramList.add(new ParameterDefinitionImpl(PARAM_DEEP_COPY, DataTypeDefinition.BOOLEAN, false, getParamDisplayLabel(PARAM_DEEP_COPY))); paramList.add(new ParameterDefinitionImpl(PARAM_OVERWRITE_COPY, DataTypeDefinition.BOOLEAN, false, getParamDisplayLabel(PARAM_OVERWRITE_COPY))); } diff --git a/source/java/org/alfresco/repo/action/executer/LinkCategoryActionExecuter.java b/source/java/org/alfresco/repo/action/executer/LinkCategoryActionExecuter.java index cab897e7be..60545bf0ea 100644 --- a/source/java/org/alfresco/repo/action/executer/LinkCategoryActionExecuter.java +++ b/source/java/org/alfresco/repo/action/executer/LinkCategoryActionExecuter.java @@ -92,7 +92,7 @@ public class LinkCategoryActionExecuter extends ActionExecuterAbstractBase @Override protected void addParameterDefinitions(List paramList) { - paramList.add(new ParameterDefinitionImpl(PARAM_CATEGORY_ASPECT, DataTypeDefinition.QNAME, true, getParamDisplayLabel(PARAM_CATEGORY_ASPECT))); + paramList.add(new ParameterDefinitionImpl(PARAM_CATEGORY_ASPECT, DataTypeDefinition.QNAME, false, getParamDisplayLabel(PARAM_CATEGORY_ASPECT))); paramList.add(new ParameterDefinitionImpl(PARAM_CATEGORY_VALUE, DataTypeDefinition.NODE_REF, true, getParamDisplayLabel(PARAM_CATEGORY_VALUE))); } @@ -107,9 +107,15 @@ public class LinkCategoryActionExecuter extends ActionExecuterAbstractBase { // Get the rule parameter values QName categoryAspect = (QName)ruleAction.getParameterValue(PARAM_CATEGORY_ASPECT); + if (categoryAspect == null) + { + // Use the default general classifiable aspect + //cm:generalclassifiable + categoryAspect = ContentModel.ASPECT_GEN_CLASSIFIABLE; + } NodeRef categoryValue = (NodeRef)ruleAction.getParameterValue(PARAM_CATEGORY_VALUE); - // Check that the apect is classifiable and is currently applied to the node + // Check that the aspect is classifiable and is currently applied to the node if (this.dictionaryService.isSubClass(categoryAspect, ContentModel.ASPECT_CLASSIFIABLE) == true) { // Get the category property qname