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

Merged V4.0 to HEAD

Browse Source 
33056: Fix for ALF-12280: Upgrading from version 3.4.7 to 4.0.0 failed with MS SQL database
    - Added dialect-specific script for SQL Server
   33059: Fix for ALF-12127, ALF-11161, ALF-11988
      Merged BRANCHES/DEV/THOR1 to BRANCHES/V4.0
         33049: Fixed follow issues on THOR-839 & THOR-826
                - Following webscripts now sets "Content-Type" response header to application/json
                - which makes people search display follow buttons for people correctly
      Fix for ALF-12077
         Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
            32999: Fix for ALF-12050 - IE specific handling of Ajax requests does not correctly respect no-cache setting, need to set Expires header also
   33060: Fix for ALF-12208 - group name encoding
   33073: Fix for ALF-12295 - CLONE - Upload issue ? - Failed to get content ... (No such file or directory) ... x22
   33087: Calendar: Permissions updates, fixes: ALF-12179 & makes the permissions flag boolean.
   33088: FIXED : ALF-11862: An error message appears when you open the "edit task", to request to join the "moderated site"
   Now handles null value
   33102: Fix for ACT #15024-37148 (will update with JIRA no. once available) 
   - issue where in a load balanced Share environment (multiple web-tiers behind a reverse proxy) the modification to the template layout selection for a site or user dashboard would not be reflected in all servers.
   33105: Bitrock license notice file.
   33110: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0:
      33109: ALF-11479: When upgrading from Alfresco Community 3.4.d to 4.0.b, some nodes that are blocked and have versions fail after the upgrade
   33114: Merged DEV to V4.0
      33067: Fix ALF-12206: CMIS: Error getting association information referencing archived node
   33122: Fix for ALF-12316 Repo -> SOLR query uses HTTPClient that only supports 2 simultaneous connections
   - configurable via spring (default if unconfigured is 40 connections to one host and 40 max connections)
   33142: ALF-12339: Prevents ArrayOutOfBoundsException that can occur with concurrent access of i18n bundle in WebScript
   33320: (RECORD ONLY) Merged BRANCHES\DEV\V4.0-BUG-FIX to BRANCHESV4.0
       33305: ALF-12463 Error querying database was detected during upgrade process from 3.1 to 4.0.0.
   33326: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
       33277    ALF-12468 CLONE - Regression. Searches cause database server to thrash CPU - ALF-12426
   33331: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\V4.0
       33301: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
           33299: ALF-12281: Memory leak in ReferenceCountingReadOnlyIndexReaderFactory
       33303: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
           33302: ALF-12281: Correction to previous checkin - deal with the initial reference created by the constructor and cleared by closeIfRequired()


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33763 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-02-08 11:33:18 +00:00
parent 9389d310ae
commit 5a82f0a489
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
View File

@@ -369,14 +369,9 @@ function main()
}
catch (e)
{
try
{
formdata.cleanup();
}
catch (ce)
{
// NOTE: ignore
}
// NOTE: Do not clean formdata temp files to allow for retries. It's possible for a temp file
// to remain if max retry attempts are made, but this is rare, so leave to usual temp
// file cleanup.
// capture exception, annotate it accordingly and re-throw
if (e.message && e.message.indexOf("org.alfresco.service.cmr.usage.ContentQuotaException") == 0)

2
source/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java
View File

@@ -38,6 +38,7 @@ import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.ParseException;
import org.springframework.extensions.webscripts.AbstractWebScript;
import org.springframework.extensions.webscripts.Format;
import org.springframework.extensions.webscripts.WebScriptException;
import org.springframework.extensions.webscripts.WebScriptRequest;
import org.springframework.extensions.webscripts.WebScriptResponse;
@@ -79,6 +80,7 @@ public abstract class AbstractSubscriptionServiceWebScript extends AbstractWebSc
if (obj instanceof JSONObject || obj instanceof JSONArray)
{
res.setContentEncoding(Charset.defaultCharset().displayName());
res.setContentType(Format.JSON.mimetype() + ";charset=UTF-8");
Writer writer = res.getWriter();
if (obj instanceof JSONObject)

2
source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java
View File

@@ -439,7 +439,7 @@ public class WorkflowModelBuilder
if (constraint instanceof ListOfValuesConstraint)
{
ListOfValuesConstraint listConstraint = (ListOfValuesConstraint) constraint;
String label = listConstraint.getDisplayLabel(entry.getValue().toString());
String label = listConstraint.getDisplayLabel(String.valueOf(entry.getValue()));
return new Pair<String, String>(propName, label);
}
}