From 2af823d97b52f541c2f8617e04af03ab11f7adeb Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Thu, 9 Apr 2009 13:54:02 +0000 Subject: [PATCH] Merged V3.1 to HEAD 13625: Fix ETHREEOH-1644 13634: Merged V2.2 to V3.1 13632: Preparation for fix of ETHREEOH-1663: ML Document Editions Broken by Upgrade to 3.1 13636: Fixed ETHREEOH-1663: ML Document Editions Broken by Upgrade to 3.1 13638: Fixed ETHREEOH-1665: Copy/pasting a Specialised Folder changes the assoc qname 13639: Fixed ETHREEOH-1663: ML Document Editions Broken by Upgrade to 3.1 13640: Fixed ETHREEOH-1672: Manage Multilingual Content JSP breaks when viewing all Related Content 13641: Fixed ETHREEOH-1657: Manage Multilingual Content fails with NPE when document was previously versionable 13774: Fix for ETHREEOH-1629 13775: Fix for ETHREEOH-1645 13784: SchemaBootstrap now auto-generates a mostly-canonical schema description on new DB and on upgrades 13804: Added option to finish schema bootstrap, dump schema structure and exit 13807: Further pretty formatting of schema dump ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V2.2:r13632 Merged /alfresco/BRANCHES/V3.1:r13625,13634,13636,13638-13641,13774-13775,13784,13804,13807 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13912 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/bean/ml/MultilingualManageDialog.java | 13 +++++++++ source/web/jsp/actions/mail.jsp | 26 +++++++++-------- source/web/jsp/ml/ml-container-details.jsp | 2 +- .../web/jsp/wcm/output-path-pattern-help.jsp | 28 +++++++++++-------- 4 files changed, 45 insertions(+), 24 deletions(-) diff --git a/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java b/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java index e5de616f39..3dca85fb36 100644 --- a/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java +++ b/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java @@ -487,6 +487,19 @@ public class MultilingualManageDialog extends BaseDialogBean // add each translation in the SingleEditionBean for (VersionHistory versionHistory : translationHistories) { + for (Version checkVersion : versionHistory.getAllVersions()) + { + NodeRef frozenStateNodeRef = checkVersion.getFrozenStateNodeRef(); + if (frozenStateNodeRef.getStoreRef().getIdentifier().equals("lightWeightVersionStore")) + { + // It's the old one pulled back by serialization + // Repopulate the version history + NodeRef versionedNodeRef = checkVersion.getVersionedNodeRef(); + versionHistory = versionService.getVersionHistory(versionedNodeRef); + break; + } + } + // get the list of versions and sort them ascending according their version label List orderedVersions = new ArrayList(versionHistory.getAllVersions()); Collections.sort(orderedVersions, new VersionLabelComparator()); diff --git a/source/web/jsp/actions/mail.jsp b/source/web/jsp/actions/mail.jsp index 1f88a3a926..21167ed1aa 100644 --- a/source/web/jsp/actions/mail.jsp +++ b/source/web/jsp/actions/mail.jsp @@ -42,31 +42,35 @@ -