inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2E to HEAD

Browse Source 
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
This commit is contained in:
Kevin Roast
2010-01-20 10:42:32 +00:00
parent 2ab713d0cb
commit c1d54ada76
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/repo/model/ml/MultilingualDocumentAspect.java
View File

@@ -127,10 +127,17 @@ public class MultilingualDocumentAspect implements
* Ensure that the node is properly unhooked from the translation mechanism first. * Ensure that the node is properly unhooked from the translation mechanism first.
*/ */
public void beforeDeleteNode(NodeRef nodeRef) public void beforeDeleteNode(NodeRef nodeRef)
{
if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_MULTILINGUAL_EMPTY_TRANSLATION))
{
// We just let it get deleted
}
else
{ {
// First unhook it // First unhook it
multilingualContentService.unmakeTranslation(nodeRef); multilingualContentService.unmakeTranslation(nodeRef);
} }
}
/** /**
* Ensure that the locale is unique inside the <b>mlContainer</b>. * Ensure that the locale is unique inside the <b>mlContainer</b>.

1
source/java/org/alfresco/repo/model/ml/tools/EmptyTranslationAspectTest.java
View File

@@ -93,6 +93,7 @@ public class EmptyTranslationAspectTest extends AbstractMultilingualTestCases {
empty = multilingualContentService.addEmptyTranslation(pivot, "empty_" + System.currentTimeMillis(), Locale.CHINESE); empty = multilingualContentService.addEmptyTranslation(pivot, "empty_" + System.currentTimeMillis(), Locale.CHINESE);
nodeService.getParentAssocs(empty);
nodeService.deleteNode(empty); nodeService.deleteNode(empty);
// Ensure that the empty translation is removed from the workspace // Ensure that the empty translation is removed from the workspace