From a1a73156938c78af729853d41c537a4668e8438f Mon Sep 17 00:00:00 2001 From: bdc34 Date: Tue, 30 Mar 2010 15:39:20 +0000 Subject: [PATCH] NIHVIVO-231 login as self-edit redirects to page. --- .../vitro/webapp/controller/edit/Authenticate.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java index e05d618a5..dace2e945 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java @@ -2,9 +2,10 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; -import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.Calendar; import java.util.HashMap; +import java.util.List; import java.util.Map; import javax.servlet.ServletContext; @@ -18,6 +19,7 @@ import org.apache.commons.logging.LogFactory; import com.hp.hpl.jena.ontology.OntModel; import edu.cornell.mannlib.vedit.beans.LoginFormBean; +import edu.cornell.mannlib.vitro.webapp.auth.policy.RoleBasedPolicy.AuthRole; import edu.cornell.mannlib.vitro.webapp.beans.User; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; @@ -194,6 +196,16 @@ public class Authenticate extends VitroHttpServlet { : contextPostLoginRequest; } } + + if( AuthRole.USER.roleUri().equals( user.getRoleURI() ) ){ + /* if this is a self editor, redirect the to their page */ + List uris = userDao.getIndividualsUserMayEditAs(user.getURI()); + if( uris != null && uris.size() > 0 ){ + forwardStr = request.getContextPath() + "/individual?uri=" + URLEncoder.encode(uris.get(0), "UTF-8"); + } + } + + if (forwardStr != null) { response.sendRedirect(forwardStr); } else {