. Fix for Alfresco logo image on About page

. Manage Deleted Items action moved from browse header area to User Console screen

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-02-02 13:37:36 +00:00
parent 09c7da5cef
commit 28a528f534
6 changed files with 21 additions and 13 deletions

View File

@@ -156,13 +156,10 @@ public final class AuthenticationHelper
// store the User object in the Session - the authentication servlet will then proceed
session.setAttribute(AuthenticationHelper.AUTHENTICATION_USER, user);
// Set the current locale
I18NUtil.setLocale(Application.getLanguage(httpRequest.getSession()));
// remove the session invalidated flag
session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED);
// remove the session invalidated flag
session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED);
@@ -220,10 +217,10 @@ public final class AuthenticationHelper
// Set the current locale
I18NUtil.setLocale(Application.getLanguage(httpRequest.getSession()));
/* setup face context */
// setup faces context
FacesHelper.getFacesContext(httpRequest, httpResponse, context);
if (loginBean != null && (loginBean.getUserPreferencesBean() != null) )
if (loginBean != null && (loginBean.getUserPreferencesBean() != null))
{
String contentFilterLanguageStr = loginBean.getUserPreferencesBean().getContentFilterLanguage();
if (contentFilterLanguageStr != null)