mirror of
https://github.com/DSpace/DSpace.git
synced 2025-10-13 13:03:11 +00:00
Patch #1208254 Fix eperson-editing JSPs
git-svn-id: http://scm.dspace.org/svn/repo/trunk@1223 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
@@ -118,6 +118,7 @@ public class EPersonAdminServlet extends DSpaceServlet
|
|||||||
// the new email is unique
|
// the new email is unique
|
||||||
String oldEmail = e.getEmail();
|
String oldEmail = e.getEmail();
|
||||||
String newEmail = request.getParameter("email").trim();
|
String newEmail = request.getParameter("email").trim();
|
||||||
|
String netid = request.getParameter("netid");
|
||||||
|
|
||||||
if (!newEmail.equals(oldEmail))
|
if (!newEmail.equals(oldEmail))
|
||||||
{
|
{
|
||||||
@@ -135,9 +136,14 @@ public class EPersonAdminServlet extends DSpaceServlet
|
|||||||
.equals("") ? null : request
|
.equals("") ? null : request
|
||||||
.getParameter("lastname"));
|
.getParameter("lastname"));
|
||||||
|
|
||||||
e.setNetid(request.getParameter("netid").equals("")
|
if (netid != null)
|
||||||
? null
|
{
|
||||||
: request.getParameter("netid"));
|
e.setNetid(netid.equals("") ? null : netid);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
e.setNetid(null);
|
||||||
|
}
|
||||||
|
|
||||||
// FIXME: More data-driven?
|
// FIXME: More data-driven?
|
||||||
e.setMetadata("phone", request.getParameter("phone")
|
e.setMetadata("phone", request.getParameter("phone")
|
||||||
@@ -174,9 +180,14 @@ public class EPersonAdminServlet extends DSpaceServlet
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// no change to email
|
// no change to email
|
||||||
e.setNetid(request.getParameter("netid").equals("")
|
if (netid != null)
|
||||||
? null
|
{
|
||||||
: request.getParameter("netid"));
|
e.setNetid(netid.equals("") ? null : netid);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
e.setNetid(null);
|
||||||
|
}
|
||||||
|
|
||||||
e.setFirstName(request.getParameter("firstname").equals(
|
e.setFirstName(request.getParameter("firstname").equals(
|
||||||
"") ? null : request.getParameter("firstname"));
|
"") ? null : request.getParameter("firstname"));
|
||||||
|
Reference in New Issue
Block a user