From fa49dfc9441f1437c38e633157effe6be7b218b9 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Wed, 24 Feb 2010 05:07:08 +0000 Subject: [PATCH] SAIL-337 : More changes in the action (condition) definitions - Add further unit for parameter constraint - Remove extra parameters from mimetype compare evaluator - Make madatory script node ref parameter - Add missing parameter display labels git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../messages/action-config.properties | 62 ++++++++++++++++++- .../ActionParameterConstraintTest.java | 1 + .../evaluator/CompareMimeTypeEvaluator.java | 4 +- .../action/executer/ScriptActionExecuter.java | 2 +- 4 files changed, 64 insertions(+), 5 deletions(-) diff --git a/config/alfresco/messages/action-config.properties b/config/alfresco/messages/action-config.properties index c9856be9fa..545da3de9f 100644 --- a/config/alfresco/messages/action-config.properties +++ b/config/alfresco/messages/action-config.properties @@ -19,18 +19,28 @@ no-condition.description=This condition will match any item added to the space. compare-property-value.title=Name contains value compare-property-value.description=The rule is applied to all items that has a specific value in its name. +compare-property-value.property.display-label=Property +compare-property-value.content-property.display-label=Content property +compare-property-value.value.display-label=Value +compare-property-value.operation.display-label=Comparison operation in-category.title=Has category in-category.description=The rule is applied to all items that has the specified category value. - +in-category.category-aspect.display-label=Category aspect +in-category.category-value.display-label=Category value + is-subtype.title=Content of type or sub-type is-subtype.description=The rule is applied to all items that are of a specified type or its sub-types +is-subtype.type.display-label=Type has-aspect.title=Has aspect has-aspect.description=The rule is applied to all items that have the specified aspect applied. +has-aspect.aspect.display-label=Aspect compare-mime-type.title=Content of mimetype compare-mime-type.description=The rule is applied to all items that have content of the specified mime type. +compare-mime-type.property.display-label=Property +compare-mime-type.value.display-label=Mimetype composite-condition.title=Composite Condition composite-condition.description=Combine several conditions to create a more complicate condition. @@ -47,52 +57,98 @@ compare-text-property.description=Compare a text property of the metadata, aspec has-tag.title=Has tag has-tag.description=Has a tag been applied to a node. has-tag.tag.display-label=Tag + # Actions add-features.title=Add an aspect add-features.description=This will add an aspect to the matched item. +add-features.aspect-name.display-label=Aspect remove-features.title=Remove an aspect remove-features.description=This will remove an aspect from the matched item. +remove-features.aspect-name.display-label=Aspect simple-workflow.title=Add simple workflow simple-workflow.description=This will add a simple workflow to the matched item. This will allow the item to be moved to a different space for its next step in a workflow. You can also give a space for it to be moved to if you want a reject step. +simple-workflow.approve-step.display-label=Approve step +simple-workflow.approve-folder.display-label=Approve step folder +simple-workflow.approve-move.display-label=Approve move +simple-workflow.reject-step.display-label=Reject step +simple-workflow.reject-folder.display-label=Reject step folder +simple-workflow.reject-move.display-label=Reject move link-category.title=Link to category link-category.description=This will apply a category to the matched item. +link-category.category-aspect.display-label=Category aspect +link-category.category-value.display-label=Category value transform.title=Transform and copy content transform.description=This will transform the the matched content and copy the result to a specific space +transform.mime-type.display-label=Mimetype +transform.destination-folder.display-label=Destination folder +transform.assoc-type.display-label=Association type +transform.assoc-name.display-label=Association name +transform.overwrite-copy.display-label=Overwrite copy transform-image.title=Transform and copy image transform-image.description=This will transform the matched image and copy the result to a specific space +transform-image.mime-type.display-label=Mimetype +transform-image.destination-folder.display-label=Destination folder +transform-image.assoc-type.display-label=Association type +transform-image.assoc-name.display-label=Association name +transform-image.overwrite-copy.display-label=Overwrite copy +transform-image.convert-command.display-label=Conversion command copy.title=Copy copy.description=This will copy the matched item to another space. +copy.destination-folder.display-label=Destination folder +copy.assoc-type.display-label=Association type +copy.assoc-name.display-label=Association name +copy.deep-copy.display-label=Deep copy +copy.overwrite-copy.display-label=Overwrite copy move.title=Move move.description=This will move the matched item to another space. +move.destination-folder.display-label=Destination folder +move.assoc-type.display-label=Association type +move.assoc-name.display-label=Association name mail.title=Send email mail.description=This will send an email to a list of users when the content matches. +mail.to.display-label=To +mail.to_many.display-label=To +mail.subject.display-label=Subject +mail.text.display-label=Body +mail.from.display-label=From +mail.template.display-label=E-Mail template check-in.title=Check in check-in.description=This will check in the matched content. +check-in.description.display-label=Description +check-in.minorChange.display-label=Minor change check-out.title=Check out check-out.description=This will check out the matched content. +check-out.destination-folder.display-label=Destination folder +check-out.assoc-type.display-label=Association type +check-out.assoc-name.display-label=Association name set-property-value.title=Set property value set-property-value.description=This will set the value of a property to a given value. +set-property-value.property.display-label=Property +set-property-value.value.display-label=Value import.title=Import import.description=Imports an Alfresco content package into the repository. +import.encoding.display-label=Encoding +import.destination.display-label=Destination extract-metadata.title=Extract common metadata fields extract-metadata.description=Imports title, author and description metadata fields from common content types. specialise-type.title=Specialise type specialise-type.description=This will specialise the matched item to a given type. +specialise-type.type-name.display-label=Type export.title=Export Space export.description=Exports a Space and optionally it's children to an Alfresco export package. @@ -104,6 +160,7 @@ export.package.error=Failed to find temporary file for export script.title=Execute script script.description=Execute a JavaScript file to perform tasks such as creating new files or folders. +script.script-ref.display-label=Script counter.title=Increment Counter counter.counter=Increment the counter property for the item. @@ -113,6 +170,9 @@ execute-all-rules.description=Execute all rules on the child items. start-workflow.title=Start Workflow start-workflow.description=This will start a workflow for the matched items. +start-workflow.workflowName.display-label=Workflow name +start-workflow.endStartTask.display-label=Task +start-workflow.startTaskTransition.display-label=Transition # WCM Actions diff --git a/source/java/org/alfresco/repo/action/constraint/ActionParameterConstraintTest.java b/source/java/org/alfresco/repo/action/constraint/ActionParameterConstraintTest.java index 9f06070d26..cc25412780 100644 --- a/source/java/org/alfresco/repo/action/constraint/ActionParameterConstraintTest.java +++ b/source/java/org/alfresco/repo/action/constraint/ActionParameterConstraintTest.java @@ -93,6 +93,7 @@ public class ActionParameterConstraintTest extends BaseSpringTest testConstraint("ac-mimetypes"); testConstraint("ac-email-templates"); testConstraint("ac-scripts"); + testConstraint("ac-content-properties"); } private void testConstraint(String name) diff --git a/source/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluator.java b/source/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluator.java index c37809d97b..cb43ce7211 100644 --- a/source/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluator.java +++ b/source/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluator.java @@ -102,8 +102,6 @@ public class CompareMimeTypeEvaluator extends ComparePropertyValueEvaluator protected void addParameterDefinitions(List paramList) { paramList.add(new ParameterDefinitionImpl(PARAM_PROPERTY, DataTypeDefinition.QNAME, false, getParamDisplayLabel(PARAM_PROPERTY))); - paramList.add(new ParameterDefinitionImpl(PARAM_CONTENT_PROPERTY, DataTypeDefinition.TEXT, false, getParamDisplayLabel(PARAM_CONTENT_PROPERTY))); - paramList.add(new ParameterDefinitionImpl(PARAM_VALUE, DataTypeDefinition.ANY, true, getParamDisplayLabel(PARAM_VALUE), false, "ac-mimetypes")); - //paramList.add(new ParameterDefinitionImpl(PARAM_OPERATION, DataTypeDefinition.TEXT, false, getParamDisplayLabel(PARAM_OPERATION), false, "ac-compare-operations")); + paramList.add(new ParameterDefinitionImpl(PARAM_VALUE, DataTypeDefinition.ANY, true, getParamDisplayLabel(PARAM_VALUE), false, "ac-mimetypes")); } } diff --git a/source/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java b/source/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java index 6f6f6aceec..5795e8daef 100644 --- a/source/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java +++ b/source/java/org/alfresco/repo/action/executer/ScriptActionExecuter.java @@ -192,7 +192,7 @@ public class ScriptActionExecuter extends ActionExecuterAbstractBase */ protected void addParameterDefinitions(List paramList) { - paramList.add(new ParameterDefinitionImpl(PARAM_SCRIPTREF, DataTypeDefinition.NODE_REF, false, getParamDisplayLabel(PARAM_SCRIPTREF), false, "ac-scripts")); + paramList.add(new ParameterDefinitionImpl(PARAM_SCRIPTREF, DataTypeDefinition.NODE_REF, true, getParamDisplayLabel(PARAM_SCRIPTREF), false, "ac-scripts")); } /**