Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 667 → Rev 668

/impl/src/java/pt/estgp/estgweb/web/DirWebProxy.java
430,12 → 430,21
UserSession userSession = UserSessionProxy.loadUserSessionFromRequest(request);
 
parameters.put("contextPath", request.getContextPath());
if (userSession.getUsername() != null)
parameters.put("username", userSession.getUsername());
if (userSession.getName() != null)
parameters.put("name", userSession.getName());
if (userSession.getUser() != null)
parameters.put("roles", userSession.getUser().getRoles());
String username = "descolnhecido";
String roles = "";
String name = username;
 
if (userSession != null && userSession.getUsername() != null)
username = userSession.getUsername();
if (userSession != null && userSession.getName() != null)
name = userSession.getName();
if (userSession != null && userSession.getUser() != null)
roles = userSession.getUser().getRoles();
 
parameters.put("username", username);
parameters.put("name", name);
parameters.put("roles", roles);
 
parameters.put("ACTUAL", actualNodeId);
parameters.put("ACTUAL_REMOTE_CHILD", actualRemoteNodeId);