From 4c264330282f88c2b3a41ef1dd7be0366b063fc4 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Wed, 23 Sep 2015 20:52:28 +0000 Subject: [PATCH] RM-2477 (The downgrade instructions are not required when only one of the Downgrade date or event is completed) - Removing the downgrade instructions check as the method checkConsistencyOfProperties in ClassifiedAspect already does this check. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@112934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../script/classification/ClassifyContentBase.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentBase.java index 5370772d81..b789874de7 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentBase.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentBase.java @@ -118,10 +118,6 @@ public abstract class ClassifyContentBase extends AbstractRmWebScript String downgradeDate = getStringValueFromJSONObject(jsonObject, DOWNGRADE_DATE, false, false); String downgradeEvent = getStringValueFromJSONObject(jsonObject, DOWNGRADE_EVENT, false, false); String downgradeInstructions = getStringValueFromJSONObject(jsonObject, DOWNGRADE_INSTRUCTIONS, false, false); - if ((isNotBlank(downgradeDate) || isNotBlank(downgradeEvent)) && isBlank(downgradeInstructions)) - { - throw new WebScriptException(STATUS_BAD_REQUEST, "Downgrade instructions cannot be empty if downgrade date and/or downgrade event has/have been set."); - } String declassificationDate = getStringValueFromJSONObject(jsonObject, DECLASSIFICATION_DATE, false, false); String declassificationEvent = getStringValueFromJSONObject(jsonObject, DECLASSIFICATION_EVENT, false, false); Set exemptionCategoryIds = getExemptionCategoryIds(jsonObject);