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

ACE-1153: Alfresco Explorer: It is impossible to change start location for the users.

Browse Source 
- 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
This commit is contained in:
Pavel Yurke
2014-04-02 09:01:36 +00:00
parent 794e39df54
commit 7d3ca3cb8d
1 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/java/org/alfresco/web/bean/users/UserPreferencesBean.java
View File

@@ -26,7 +26,6 @@ import java.util.ResourceBundle;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem; import javax.faces.model.SelectItem;
import javax.transaction.UserTransaction;
import org.alfresco.service.cmr.ml.ContentFilterLanguagesService; import org.alfresco.service.cmr.ml.ContentFilterLanguagesService;
import org.alfresco.service.cmr.ml.MultilingualContentService; import org.alfresco.service.cmr.ml.MultilingualContentService;
@@ -114,22 +113,7 @@ public class UserPreferencesBean implements Serializable
{ {
if (this.contentFilterLanguage == null) if (this.contentFilterLanguage == null)
{ {
Locale locale = null; Locale locale = (Locale) PreferencesService.getPreferences().getValue(PREF_CONTENTFILTERLANGUAGE);
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) {}
}
// Null means All Languages // Null means All Languages
if (locale == null) if (locale == null)
@@ -277,22 +261,8 @@ public class UserPreferencesBean implements Serializable
*/ */
public String getStartLocation() public String getStartLocation()
{ {
String location = null; String location = (String)PreferencesService.getPreferences().getValue(PREF_STARTLOCATION);
UserTransaction tx = null;
try
{
FacesContext context = FacesContext.getCurrentInstance();
tx = Repository.getUserTransaction(context, true);
tx.begin();
location = (String)PreferencesService.getPreferences().getValue(PREF_STARTLOCATION);
tx.commit();
}
catch (Throwable err)
{
try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
}
if (location == null) if (location == null)
{ {
// default to value from client config // default to value from client config