From 95454a34dc0fcd6831c15f72b75989455e60710a Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Thu, 9 Aug 2012 16:37:33 +0000 Subject: [PATCH] Merged V4.1-BUG-FIX to HEAD 39199: Fixed ALF-13252 "Share - Added aspects are not shown in folder properties" 39235: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_07_09 to BRANCHES/DEV/V4.1-BUG-FIX: 38994: ALF-14983 : Upgrade scripts to increase column sizes for Activiti 39052: ALF-14983 : Upgrade scripts to increase column sizes for Activiti (note: reviewed and merged, including required merge ghanges to .sql, .properties, .xml for schema number update 5111 -> 5112) 39239: ALF-14111 CLONE - 60k sites: Groups are not displayed in all supported browsers when 60k sites and 60 groups in the system - Code works on 3.4 as it includes a fix for ALF-7604 (3.4.2). - V4.1 should also have this fix (but did not) as there was a clone ALF-7734 (of ALF-7604) applied to Team that was merged to HEAD (and hence 4.x). The merge to HEAD failed to include this fix. - Putting this code back into 4.1.1 - this should correct this issue (ALF-14111) as the code will no longer have to sort 240,000 groups when there are 60,000 user created groups. 39257: ALF-10730: Fall back on parentType for icons if necessary 39307: Fix for ALF-14799 - jsonUtils.toJSONString() outputs long values as floating-point numbers - Updated to latest Surf libs rev 1101 which fixes this issue 39310: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_07_09 to BRANCHES/DEV/V4.1-BUG-FIX 39071: ALF-13767: User error messages in org.alfresco.repo.web.scripts are all hardcoded and cannot be localised Modify Java backed webscripts to return localised messages to model. 39345: Impl from Shane Frensley to fix ALF-3484 - Alfresco should show meaningful error message when deleted item recovery fails. 39362: RECORD ONLY MERGE from V3.4-BUG-FIX to V4.1-BUG-FIX 39360: <> Remove the creation of OSX installers - we will never need them any more since they are neither distributed not trialled 39416: Fix for ALF-14466 Share Document Library breaks for obscure control character in document title 39594: Minor formatting tweak for coding standards consistency. 39622: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 39605: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - transformer.PdfBox.TextToPdf no longer does txt to pdf transform as OOo/JOD handles non western chars better and are not that much slower even for western encodings - It still does csv and xml to pdf - transformer.complex.Text.Pdf2swf now has a wild card first transformer for text to pdf (rather than transformer.PdfBox.TextToPdf) The 2nd transform is still transformer.Pdf2swf. As a result transformer.PdfBox.TextToPdf or the OOo/JOD transformers may be used. - transformer.complex.Archive.Pdf2swf now has a wild card first transformer for the same reason. - transformer.complex.Text.Image now has a wild card first transformer for the same reason. - Allow transformer config element supportedTransformations to wild card source or target mimetype 39692: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 39679: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - Fix build failures (not sure about RecordsManagementAuditServiceImplTest) - Reset some of the text to pdf / swf limits now OOo or JOD is used rather than PDFBox 39719: ALF-13037: Ensure that doclist is refreshed when on edit properties triggered folder rule that causes documents to be moved 39734: Improvements to reduce need to index Surf component XML files - parent config folders already dealt with, but this removes the burden of indexing the XML content. (ALF-10826) 39740: Merged BRANCHES/V4.1 to BRANCHES/DEV/V4.1-BUG-FIX: (record-only - already present) 39734: Improvements to reduce need to index Surf component XML files - parent config folders already dealt with, but this removes the burden of indexing the XML content. 39779: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 39774: ALF-15262: Merged V4.0-BUG-FIX to V3.4-BUG-FIX 35738: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX: 35737: Fix for ALF-11923. Linked rules can't be deleted if source folder was deleted. 35751: Addendum to fix for ALF-11923. Fixing failing test case by tightening up delete behaviour. I also fixed the @since annotations from Odin to 3.4.11 39777: ALF-15262: Fixed compilation error by re-introducing typo in method name! 39784: Merged BRANCHES/V4.1 to BRANCHES/DEV/V4.1-BUG-FIX (RECORD ONLY) 39775: ALF-15271: "Site Content" dashlet shows all documents from all the sites in Alfresco Share 39831: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.1) 39015: Merged in upgrade of truezip to 7.5.5 see ALF-14247 39361: Added truezip-swing jar. It seems that Truezip needs Swing :( git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/webclient.properties | 2 ++ .../web/bean/trashcan/TrashcanDialog.java | 27 ++++++++++++++++--- .../trashcan/TrashcanRecoverItemDialog.java | 6 +++++ 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index d42c3b8e5c..3751f2ccbb 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -1524,6 +1524,8 @@ recovered_item_integrity=Failed to recover the item \"{0}\" as there is now an i recovered_item_integrity_short=Item with same name exists recovered_item_failure=Failed to recover the item \"{0}\" due to error: {1} recovered_item_failure_short=Failed +recovered_item_duplicate=Failed to recover the item \"{0}\", duplicate name not allowed. +recovered_item_duplicate_short=Duplicate name not allowed delete_item_success=The item \"{0}\" has been permanently deleted. title_deleted_item_details=Deleted Item Details deleteditem_details_description=Details of the deleted item diff --git a/source/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java b/source/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java index 4a44bd8e26..524ba96c94 100644 --- a/source/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java +++ b/source/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java @@ -76,6 +76,7 @@ public class TrashcanDialog extends BaseDialogBean implements IContextListener private static final String MSG_DELETED_ITEMS_FOR = "deleted_items_for"; private static final String MSG_DELETED_ITEMS = "deleted_items"; + private static final String MSG_RECOVERED_ITEM_DUPLICATE_S = "recovered_item_duplicate_short"; private static final String MSG_RECOVERED_ITEM_INTEGRITY_S = "recovered_item_integrity_short"; private static final String MSG_RECOVERED_ITEM_PERMISSION_S = "recovered_item_permission_short"; private static final String MSG_RECOVERED_ITEM_PARENT_S = "recovered_item_parent_short"; @@ -86,6 +87,7 @@ public class TrashcanDialog extends BaseDialogBean implements IContextListener private final static String MSG_CLOSE = "close"; private static final String PROP_RECOVERSTATUS = "recoverstatus"; + private static final String PROP_RECOVERERRORMESSAGE = "recovererrormessage"; private static final String FILTER_DATE_ALL = "all"; private static final String FILTER_DATE_TODAY = "today"; @@ -106,6 +108,9 @@ public class TrashcanDialog extends BaseDialogBean implements IContextListener private final static String SEARCH_TEXT_QUOTED = "PARENT:\"%s\" AND ASPECT:\"%s\" AND TEXT:\"%s\""; private final static String SEARCH_USERPREFIX = "@" + USER_ATTR + ":%s AND "; + /** maximum number of failed items to report to the user */ + private static final int MAX_FAILURE_REPORTS = 25; + /** The PermissionService reference */ transient protected PermissionService permissionService; @@ -697,6 +702,7 @@ public class TrashcanDialog extends BaseDialogBean implements IContextListener protected void saveReportDetail(List reports) { // store the results ready for the next dialog page + int failureItemsCount = 0; property.setSuccessItems(new ArrayList(reports.size())); property.setFailureItems(new ArrayList(reports.size())); for (RestoreNodeReport report : reports) @@ -709,9 +715,14 @@ public class TrashcanDialog extends BaseDialogBean implements IContextListener } else { - Node node = new Node(report.getArchivedNodeRef()); - node.getProperties().put(PROP_RECOVERSTATUS, report.getStatus()); - property.getFailureItems().add(node); + if (failureItemsCount < MAX_FAILURE_REPORTS) + { + Node node = new Node(report.getArchivedNodeRef()); + node.getProperties().put(PROP_RECOVERSTATUS, report.getStatus()); + node.getProperties().put(PROP_RECOVERERRORMESSAGE, report.getCause().getMessage()); + property.getFailureItems().add(node); + failureItemsCount++; + } } } } @@ -780,7 +791,9 @@ public class TrashcanDialog extends BaseDialogBean implements IContextListener { buf.append(""); String msg; - switch ((RestoreStatus)node.getProperties().get(PROP_RECOVERSTATUS)) + RestoreStatus status = (RestoreStatus) node.getProperties().get(PROP_RECOVERSTATUS); + String message = (String) node.getProperties().get(PROP_RECOVERERRORMESSAGE); + switch (status) { case FAILURE_INVALID_PARENT: msg = MSG_RECOVERED_ITEM_PARENT_S; @@ -794,11 +807,17 @@ public class TrashcanDialog extends BaseDialogBean implements IContextListener msg = MSG_RECOVERED_ITEM_INTEGRITY_S; break; + case FAILURE_DUPLICATE_CHILD_NODE_NAME: + msg = MSG_RECOVERED_ITEM_DUPLICATE_S; + break; + default: msg = MSG_RECOVERED_ITEM_FAILURE_S; break; } buf.append(Application.getMessage(fc, msg)); + buf.append(": "); + buf.append(message); buf.append(""); } else diff --git a/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java b/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java index a901d87d07..fc4b2b21f3 100644 --- a/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java +++ b/source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java @@ -35,6 +35,7 @@ public class TrashcanRecoverItemDialog extends TrashcanDialog private static final String RICHLIST_ID = "trashcan-list"; private static final String RICHLIST_MSG_ID = "trashcan" + ':' + RICHLIST_ID; private static final String MSG_RECOVERED_ITEM_SUCCESS = "recovered_item_success"; + private static final String MSG_RECOVERED_ITEM_DUPLICATE = "recovered_item_duplicate"; private static final String MSG_RECOVERED_ITEM_INTEGRITY = "recovered_item_integrity"; private static final String MSG_RECOVERED_ITEM_PERMISSION = "recovered_item_permission"; private static final String MSG_RECOVERED_ITEM_PARENT = "recovered_item_parent"; @@ -92,6 +93,11 @@ public class TrashcanRecoverItemDialog extends TrashcanDialog errorfacesMsg = new FacesMessage(FacesMessage.SEVERITY_ERROR, msg, msg); break; + case FAILURE_DUPLICATE_CHILD_NODE_NAME: + msg = MessageFormat.format(Application.getMessage(fc, MSG_RECOVERED_ITEM_DUPLICATE), item.getName()); + errorfacesMsg = new FacesMessage(FacesMessage.SEVERITY_ERROR, msg, msg); + break; + default: String reason = report.getCause().getMessage(); msg = MessageFormat.format(Application.getMessage(fc, MSG_RECOVERED_ITEM_FAILURE), item.getName(), reason);