From c1d54ada76c982fccdab9a1de0fc8464d2847e99 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Wed, 20 Jan 2010 10:42:32 +0000 Subject: [PATCH] Merged V3.2E to HEAD 17623: ETHREEOH-1733 - fix for multiday events that x weeks long exactly 17625: Fix for ETHREEOH-3468 - Missing null check in WebScript AbstractRuntime when an authenticator is not provided by the Runtime. 17626: missed checkin file for ETHREEOH-1733 fix 17627: Undid change fix for ETHREEOH-1229: Can't delete space that contains "translation without content" - I can't see how this affects the build but one has to start somewhere 17628: Added a getParentAssocs in test to help diagnose failure cause 17629: ETHREEOH-3062 - Minimize Share treeview load during expansion 17630: Fix unreported issue where argsM values are incorrect when more than one parameter present on the URL in SURF local WebScript request. Also minor performance improvements to SURF/WSF after profiling tests. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18161 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/model/ml/MultilingualDocumentAspect.java | 11 +++++++++-- .../model/ml/tools/EmptyTranslationAspectTest.java | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/model/ml/MultilingualDocumentAspect.java b/source/java/org/alfresco/repo/model/ml/MultilingualDocumentAspect.java index 9e05a10b11..4d4b676334 100644 --- a/source/java/org/alfresco/repo/model/ml/MultilingualDocumentAspect.java +++ b/source/java/org/alfresco/repo/model/ml/MultilingualDocumentAspect.java @@ -128,8 +128,15 @@ public class MultilingualDocumentAspect implements */ public void beforeDeleteNode(NodeRef nodeRef) { - // First unhook it - multilingualContentService.unmakeTranslation(nodeRef); + if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_MULTILINGUAL_EMPTY_TRANSLATION)) + { + // We just let it get deleted + } + else + { + // First unhook it + multilingualContentService.unmakeTranslation(nodeRef); + } } /** diff --git a/source/java/org/alfresco/repo/model/ml/tools/EmptyTranslationAspectTest.java b/source/java/org/alfresco/repo/model/ml/tools/EmptyTranslationAspectTest.java index 03cde1fbfb..82d462ffb1 100644 --- a/source/java/org/alfresco/repo/model/ml/tools/EmptyTranslationAspectTest.java +++ b/source/java/org/alfresco/repo/model/ml/tools/EmptyTranslationAspectTest.java @@ -93,6 +93,7 @@ public class EmptyTranslationAspectTest extends AbstractMultilingualTestCases { empty = multilingualContentService.addEmptyTranslation(pivot, "empty_" + System.currentTimeMillis(), Locale.CHINESE); + nodeService.getParentAssocs(empty); nodeService.deleteNode(empty); // Ensure that the empty translation is removed from the workspace