From 7047f346fbf5f97c914dcd0079ab529ae405be1e Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Fri, 1 Mar 2013 12:32:11 +0000 Subject: [PATCH] Merged V4.1-BUG-FIX to HEAD 47256: Merged DEV to V4.1-BUG-FIX 47145: ALF-17877 : CLONE - The deleted via Sharepoint document is not removed from Alfresco but hidden aspect is added for it Setting webdav client for all webdav requests in SPP module. 47257: ALF-17816 (Incorrect tooltip 'Locked by' icon for other user) 47285: ALF-17635: Incorrect behavior of Move action in Update rule and Outbound rule in Share - Altered MoveActionExcecuter so that it doesn't fire on a working copy and will hence wait for checkin 47287: Fixes ALF-2590: Calendar doesn't handle 401 errors properly: - callUtils now pass on non 200 status codes (rather than swallowing errors) - updates create-event template to handle missing data. 47288: ALF-17057: SPP: Extra version is created when add new document via Document Connection on MacOS X Lion - Now we ignore empty content when we create the initial version 47290: ALF-16931: Bootstrapped users with Uppercase name cannot see site they have been invited to - Changed the code to be conditional on association type 47296: ALF-4565: Incorrect behaviour of Edit Online action if document's name contains wildcards - URLs were incorrectly being double decoded in DefaultAuthenticationHandler 47308: Merged DEV to V4.1-BUG-FIX 47298: ALF-17907 : specified index does not exist during upgrade to 4.1.2 The droppping of alf_node.store_id index was marked as optional to support the upgrades from originally Alfresco 2.2 for Oracle DB. 47314: Fixed ALF-13679 "Cannot play a movie file in Preview, which has double byte characters in the file name" 47322: ALL LANGS: Translation updates based on EN r47138 47325: ALL LANGS: Translation updates based on EN r47138 47327: Removes unused TinyMCE files (as part of ALF-17451 ) 47329: FR, IT, NL: Fixes ALF-17413 47331: Implements fix suggested in ALF-17451, updates fixes for ALF-8486, ALF-10690 and ALF-11000. 47334: ALF-16991: Editing Rich Text files in TinyMCE loses some formatting. 47340: Merged DEV to V4.1-BUG-FIX 47306: ALF-17907 : specified index does not exist during upgrade to 4.1.2 The droppping of alf_node.store_id index was marked as optional to support the upgrades from originally Alfresco 2.2 for MS SQL Server. 47353: Merged V4.1-BUG-FIX-2012_11_26 to V4.1-BUG-FIX 44182: ALF-15970: OpenOffice form not found Show error message if form definition could not be found 47383: ALF-17222: "Protected attribute not take into account for target of associations" 47392: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2013_02_26 to BRANCHES/DEV/V4.1-BUG-FIX: 47313: ALF-18006 : Sending a PUT request without a Content-Type header resets the contents mimetype to application/octet-stream 47402: ALF-18212: SOLR OOTB cache sizes are too big and require >20GB heap space - Reduced default cache sizes from 512 to 64 47405: Fixes: ALF-14412 - Tag filtering in blogs 47407: Fix failing unit tests - use public services where transactions are required 47410: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 47293: (RECORD ONLY) Merged DEV to V3.4-BUG-FIX 43417: ALF-14710 JUnit test for WebServiceSuiteSystemTest project fails - testPropertySetGet() method was updated in RepositoryServiceSystemTest class 47311: ALF-18213 / ALF-18005: webscript guestDownload does not set Content-Dispositon HTTP header - Follow on from ALF-9817 - Now it does it properly 47414: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 47332: ALF-17640: Merged V4.1-BUG-FIX to V3.4-BUG-FIX 45828: Additional fix for ALF-17153 FTS query parser FTSQueryParser is not debuggable 47385: ALF-17935: Merged PATCHES/V4.0.2 to V3.4-BUG-FIX 42969: Merged DEV to PATCHES/V4.0.2 42967: MNT-158: SharePoint Protocol Opening Documents in Read-Only for Site Consumer with Collaborator Privileges Remove manual throwing of AccessDeniedException is user has "consumer" or "contributor" role. Create "links" container from system user. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/webclient_es.properties | 4 ++-- .../app/servlet/BaseDownloadContentServlet.java | 16 +++++----------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/config/alfresco/messages/webclient_es.properties b/config/alfresco/messages/webclient_es.properties index a8e4a8fbac..177d078b55 100755 --- a/config/alfresco/messages/webclient_es.properties +++ b/config/alfresco/messages/webclient_es.properties @@ -731,7 +731,7 @@ undo_checkout=Deshacer bloqueo undo_checkout_info=Si deshace el bloqueo de un documento, se eliminar\u00e1 la copia de trabajo asociada y se perder\u00e1n todos los cambios efectuados en ella desde el Bloqueo. cancel_editing_for=Cancelar edici\u00f3n para cancel_editing_info=\u00bfEst\u00e1 seguro de que quiere cancelar la edici\u00f3n? Se perder\u00e1n todos los cambios en la copia de trabajo. -complete=complete +complete=completado working_copy_for=Copia de trabajo para working_copy_missing_info=La copia de trabajo ya no est\u00e1 disponible. Esto podr\u00eda ser consecuencia de la(s) regla(s) activa(s) aplicadas al espacio que usted ha bloqueado. @@ -904,7 +904,7 @@ create_form_form_details_desc=Introduzca informaci\u00f3n sobre el formulario qu create_form_form_details_step1_desc=Seleccione el esquema XML a utilizar create_form_form_details_step2_desc=Especifique los detalles para el nuevo formulario. create_form_form_details_no_elements_in_schema=Este esquema no contiene declaraciones de elementos. Un esquema debe contener al menos una declaraci\u00f3n de elemento para generar un formulario. -create_form_form_details_no_schema_selected= +create_form_form_details_no_schema_selected= create_form_form_details_associated_web_projects=Actualmente este formulario est\u00e1 configurado para los siguientes proyectos Web: create_form_configure_rendering_engine_templates_title=Configurar plantillas create_form_configure_rendering_engine_templates_step_title=Segundo paso - Configurar plantillas diff --git a/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java b/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java index 4f2133ec00..6e3a180830 100644 --- a/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java +++ b/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java @@ -384,18 +384,12 @@ public abstract class BaseDownloadContentServlet extends BaseServlet private void setHeaderContentDisposition(HttpServletRequest req, HttpServletResponse res, String filename) { - // set header based on filename - will force a Save As from the browse if it doesn't recognise it - // this is better than the default response of the browser trying to display the contents + // set header based on filename - will force a Save As from the browse if it doesn't recognise it + // this is better than the default response of the browser trying to display the contents - // IE requires that "Content-Disposition" header in case of "attachment" type should include - // "filename" part. - StringBuilder attachmentValue = new StringBuilder(128).append("attachment"); - String userAgent = req.getHeader(HEADER_USER_AGENT); - if (userAgent != null && userAgent.toLowerCase().contains("msie")) - { - attachmentValue.append("; filename=\"").append(res.encodeURL(filename)).append("\""); - } - res.setHeader(HEADER_CONTENT_DISPOSITION, attachmentValue.toString()); + // IE requires that "Content-Disposition" header in case of "attachment" type should include + // "filename" part. Should be harmless in other browsers. + res.setHeader(HEADER_CONTENT_DISPOSITION, "attachment; filename=\"" + URLEncoder.encode(filename)+ "\""); } /**