From 7d3ca3cb8d93687a65935c6e70d077dad2fa1452 Mon Sep 17 00:00:00 2001 From: Pavel Yurke Date: Wed, 2 Apr 2014 09:01:36 +0000 Subject: [PATCH] ACE-1153: Alfresco Explorer: It is impossible to change start location for the users. - Remove read-only transactions from UserPreferencesBean git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/bean/users/UserPreferencesBean.java | 34 ++----------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/source/java/org/alfresco/web/bean/users/UserPreferencesBean.java b/source/java/org/alfresco/web/bean/users/UserPreferencesBean.java index 60faf7c403..ecdf647cd1 100644 --- a/source/java/org/alfresco/web/bean/users/UserPreferencesBean.java +++ b/source/java/org/alfresco/web/bean/users/UserPreferencesBean.java @@ -26,7 +26,6 @@ import java.util.ResourceBundle; import javax.faces.context.FacesContext; import javax.faces.model.SelectItem; -import javax.transaction.UserTransaction; import org.alfresco.service.cmr.ml.ContentFilterLanguagesService; import org.alfresco.service.cmr.ml.MultilingualContentService; @@ -114,22 +113,7 @@ public class UserPreferencesBean implements Serializable { if (this.contentFilterLanguage == null) { - Locale locale = null; - UserTransaction tx = null; - try - { - FacesContext context = FacesContext.getCurrentInstance(); - tx = Repository.getUserTransaction(context, true); - tx.begin(); - - locale = (Locale) PreferencesService.getPreferences().getValue(PREF_CONTENTFILTERLANGUAGE); - - tx.commit(); - } - catch (Throwable err) - { - try { if (tx != null) {tx.rollback();} } catch (Exception tex) {} - } + Locale locale = (Locale) PreferencesService.getPreferences().getValue(PREF_CONTENTFILTERLANGUAGE); // Null means All Languages if (locale == null) @@ -277,22 +261,8 @@ public class UserPreferencesBean implements Serializable */ public String getStartLocation() { - String location = null; - UserTransaction tx = null; - try - { - FacesContext context = FacesContext.getCurrentInstance(); - tx = Repository.getUserTransaction(context, true); - tx.begin(); + String location = (String)PreferencesService.getPreferences().getValue(PREF_STARTLOCATION); - location = (String)PreferencesService.getPreferences().getValue(PREF_STARTLOCATION); - - tx.commit(); - } - catch (Throwable err) - { - try { if (tx != null) {tx.rollback();} } catch (Exception tex) {} - } if (location == null) { // default to value from client config