litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1207 improve code formatting in Authenticate.

Browse source
This commit is contained in:
jeb228 2010-11-04 14:45:19 +00:00
parent 8b2e38abca
commit 78df1b181f
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
View file

@ -395,7 +395,10 @@ public class Authenticate extends FreemarkerHttpServlet {
// If the user is a self-editor, send them to their home page. // If the user is a self-editor, send them to their home page.
User user = getLoggedInUser(request); User user = getLoggedInUser(request);
if ( user != null && user.getRoleURI() != null && user.getRoleURI().equals( Integer.toString(AuthRole.USER.level()) )){ if (user != null
&& user.getRoleURI() != null
&& user.getRoleURI().equals(
Integer.toString(AuthRole.USER.level()))) {
UserDao userDao = getUserDao(request); UserDao userDao = getUserDao(request);
if (userDao != null) { if (userDao != null) {
List<String> uris = userDao.getIndividualsUserMayEditAs(user List<String> uris = userDao.getIndividualsUserMayEditAs(user
@ -437,7 +440,7 @@ public class Authenticate extends FreemarkerHttpServlet {
if (session == null) { if (session == null) {
return State.NOWHERE; return State.NOWHERE;
} }
if (LoginStatusBean.getBean(request).isLoggedIn()) { if (LoginStatusBean.getBean(request).isLoggedIn()) {
return State.LOGGED_IN; return State.LOGGED_IN;
} }