From ec04003e694b89a8a8aed8da4658d7ccbf939a48 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Mon, 24 Feb 2014 04:58:53 +0000 Subject: [PATCH 1/3] RM-1280: It's possible to create a folder in the root of File Plan via FTP/CIFS/WebDav/NFS RM-1281: Not possible to create folders in Categories via FTP/CIFS/WebDav/NFS git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.1@63128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../rm-model-context.xml | 1 + .../model/behaviour/RecordContainerType.java | 33 ++++++++++++++++--- .../recordfolder/RecordFolderServiceImpl.java | 2 +- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml index f7dc62dc12..db13fd4aec 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml @@ -56,6 +56,7 @@ parent="org_alfresco_module_rm_BaseBehaviour"> + Date: Wed, 26 Feb 2014 09:29:17 +0000 Subject: [PATCH 2/3] RM-1183 (Null is displayed in values of Supplemental Marking/Transfer Locations selection lists) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.1@63265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../caveat/RMListOfValuesConstraint.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java index edde574e40..5538808db8 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java @@ -27,8 +27,11 @@ import java.util.Map; import org.alfresco.repo.dictionary.constraint.ListOfValuesConstraint; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.dictionary.ConstraintException; +import org.alfresco.service.cmr.i18n.MessageLookup; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.TypeConversionException; +import org.apache.commons.lang.StringUtils; +import org.springframework.extensions.surf.util.I18NUtil; /** * RM Constraint implementation that ensures the value is one of a constrained @@ -44,7 +47,7 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint //private static final String ERR_NO_VALUES = "d_dictionary.constraint.list_of_values.no_values"; private static final String ERR_NON_STRING = "d_dictionary.constraint.string_length.non_string"; private static final String ERR_INVALID_VALUE = "d_dictionary.constraint.list_of_values.invalid_value"; - + private static final String LOV_CONSTRAINT_VALUE = "listconstraint"; private List allowedValues; private List allowedValuesUpper; private MatchLogic matchLogic = MatchLogic.AND; // defined match logic used by caveat matching (default = "AND") @@ -116,6 +119,22 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint } } + public String getDisplayLabel(String constraintAllowableValue, MessageLookup messageLookup) + { + if (!this.allowedValues.contains(constraintAllowableValue)) + { + return null; + } + + String key = LOV_CONSTRAINT_VALUE; + key += "." + this.getShortName(); + key += "." + constraintAllowableValue; + key = StringUtils.replace(key, ":", "_"); + + String message = messageLookup.getMessage(key, I18NUtil.getLocale()); + return message == null ? constraintAllowableValue : message; + } + private List getAllowedValuesUpper() { String runAsUser = AuthenticationUtil.getRunAsUser(); From c323b8e968e1aa38f4aee31e785688bb88b9d325 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Wed, 26 Feb 2014 09:29:31 +0000 Subject: [PATCH 3/3] RM-1101 (Label is missing for Supplemental Markings/Transfer Locations list on Edit list page) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.1@63267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rma/admin/rmconstraint/rmconstraint.lib.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.lib.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.lib.ftl index ef22554a02..e510863426 100644 --- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.lib.ftl +++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.lib.ftl @@ -28,7 +28,7 @@ "url" : "${url.serviceContext + "/api/rma/admin/rmconstraints/" + constraint.name}", "constraintName" : "${constraint.name}", "caseSensitive" : "${constraint.caseSensitive?string("true", "false")}", - "constraintTitle" : "${constraint.title}", + "constraintTitle" : "${msg(constraint.title)}", "values" : [ <#list constraint.values as value> {