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

Merged from BRANCHES/DEV/KEVINR:

Browse Source 
. Fix from Andy for jboss portal issue with audit component
. Fix to AlfrescoFacesPortlet to work with JBossPortal2.4.1

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-03-01 15:56:52 +00:00
parent 1d379ddf4b
commit f0bf542f6a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java
View File

@@ -180,8 +180,11 @@ public class AlfrescoFacesPortlet extends MyFacesGenericPortlet
String oldValue = request.getPreferences().getValue(PREF_ALF_USERNAME, null); String oldValue = request.getPreferences().getValue(PREF_ALF_USERNAME, null);
if (oldValue == null || oldValue.equals(loginBean.getUsernameInternal()) == false) if (oldValue == null || oldValue.equals(loginBean.getUsernameInternal()) == false)
{ {
request.getPreferences().setValue(PREF_ALF_USERNAME, loginBean.getUsernameInternal()); if (request.getPreferences().isReadOnly(PREF_ALF_USERNAME) == false)
request.getPreferences().store(); {
request.getPreferences().setValue(PREF_ALF_USERNAME, loginBean.getUsernameInternal());
request.getPreferences().store();
}
} }
} }
@@ -303,7 +306,10 @@ public class AlfrescoFacesPortlet extends MyFacesGenericPortlet
if (session.getAttribute(AuthenticationHelper.SESSION_INVALIDATED) != null) if (session.getAttribute(AuthenticationHelper.SESSION_INVALIDATED) != null)
{ {
// remove the username preference value as explicit logout was requested by the user // remove the username preference value as explicit logout was requested by the user
request.getPreferences().reset(PREF_ALF_USERNAME); if (request.getPreferences().isReadOnly(PREF_ALF_USERNAME) == false)
{
request.getPreferences().reset(PREF_ALF_USERNAME);
}
session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED); session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED);
} }