From a239c98c2c7cdc2bcee956890914b8fff6ca5045 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Fri, 15 Jan 2010 11:09:09 +0000 Subject: [PATCH] Merged V3.2 to HEAD 17294: Fix for ETHREEOH-3194 - It's impossible to find Blogs and Discussions by title. 17301: Activity Service fixes (ETHREEOH-1362 & ETHREEOH-1741) 17302: Fix for ETHREEOH-2849 JPG to GIF transformation fails when using imagemagick cmd line options listed in our wiki 17305: AVM - fix AVMStoreDescriptor ( creator/createDate) returned by getStores 17306: Fix for ETHREEOH-1578 - Incorrect behavior of Calendar in Month view ... 17318: Merged V3.1 to V3.2 17317: Fix for ETHREEOH-3236 It is impossible to change start location, everything is reverted to My Alfresco 17320: Merged V3.1 to V3.2 17287 - Fix for ETHREEOH-110- It is impossible to browse events by tags 17326: iBatis mapping fixes for AVM on Oracle (including ETHREEOH-3205) 17327: Merged V3.1 to V3.2 17324: Fix for ETHREEOH-2723 Script error appears when trying to edit Home Space Name for user 17329: Merged V3.1 to V3.2 17180: Merged V2.2 to V3.1 17164: Fixes for deletion of large hierarchies: (ETHREEOH-2161 and ETHREEOH-2650) 17179: (RECORD ONLY) Merged V3.1 to V2.2 ... 17330: Fix for SiteActivityTest failure (caused by earlier -ve test data) 17331: Merged V3.1 to V3.2 17190: Further fixes for ETHREEOH-2161: Delete process hangs when deleting large directory structure (with rules applied) 17207: Fix fallout from work on ETHREEOH-2161: Delete process hangs when deleting large directory structure (with rules applied) 17215: Added back firing of policies for archive stores 17351: Build fix check in to DBNodeService. Will be followed by full fix when available. 17353: Applied TransactionListenerAdapter ___________________________________________________________________ Modified: svn:mergeinfo Reverse-merged /alfresco/BRANCHES/V3.1:r13091 Merged /alfresco/BRANCHES/V2.2:r13089,13091,14190-14191,14199,14210,14216,14229,14655,14825,14869,17164,17179 Merged /alfresco/BRANCHES/V3.1:r17180,17190,17207,17215,17287,17317,17324 Merged /alfresco/BRANCHES/V3.2:r17294,17301-17302,17305-17306,17318,17320,17326-17327,17329-17331,17351,17353 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18056 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/web/bean/repository/Preferences.java | 2 +- source/web/jsp/users/new-user-wizard/edit-user-properties.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/web/bean/repository/Preferences.java b/source/java/org/alfresco/web/bean/repository/Preferences.java index 1924d7302f..3aaada6779 100644 --- a/source/java/org/alfresco/web/bean/repository/Preferences.java +++ b/source/java/org/alfresco/web/bean/repository/Preferences.java @@ -96,7 +96,7 @@ public final class Preferences implements Serializable try { FacesContext context = FacesContext.getCurrentInstance(); - tx = Repository.getUserTransaction(context, true); + tx = Repository.getUserTransaction(context); tx.begin(); getNodeService().setProperty(this.preferencesRef, qname, value); diff --git a/source/web/jsp/users/new-user-wizard/edit-user-properties.jsp b/source/web/jsp/users/new-user-wizard/edit-user-properties.jsp index b5d06428e4..bfe71c774d 100644 --- a/source/web/jsp/users/new-user-wizard/edit-user-properties.jsp +++ b/source/web/jsp/users/new-user-wizard/edit-user-properties.jsp @@ -55,7 +55,7 @@ styleClass="selector" /> - +