mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged from BRANCHES/DEV/KEVINR:
. 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:
@@ -180,8 +180,11 @@ public class AlfrescoFacesPortlet extends MyFacesGenericPortlet
|
||||
String oldValue = request.getPreferences().getValue(PREF_ALF_USERNAME, null);
|
||||
if (oldValue == null || oldValue.equals(loginBean.getUsernameInternal()) == false)
|
||||
{
|
||||
request.getPreferences().setValue(PREF_ALF_USERNAME, loginBean.getUsernameInternal());
|
||||
request.getPreferences().store();
|
||||
if (request.getPreferences().isReadOnly(PREF_ALF_USERNAME) == false)
|
||||
{
|
||||
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)
|
||||
{
|
||||
// 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);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user