hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 10:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-186] NPE during edit of eperson in XMLUI

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_5_x@3710 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Andrea Bollini
2009-04-13 15:17:56 +00:00
parent f8c30a097f
commit 9df41d355d
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowEPersonUtils.java
View File

@@ -192,7 +192,8 @@ public class FlowEPersonUtils {
EPerson personModified = EPerson.find(context, epersonID); EPerson personModified = EPerson.find(context, epersonID);
// Make sure the email address we are changing to is unique // Make sure the email address we are changing to is unique
if (!personModified.getEmail().equals(email)) String originalEmail = personModified.getEmail();
if (originalEmail == null || !originalEmail.equals(email))
{ {
EPerson potentialDupicate = EPerson.findByEmail(context,email); EPerson potentialDupicate = EPerson.findByEmail(context,email);
@@ -207,13 +208,16 @@ public class FlowEPersonUtils {
return result; return result;
} }
} }
if (!personModified.getFirstName().equals(first)) { String originalFirstName = personModified.getFirstName();
if (originalFirstName == null || !originalFirstName.equals(first)) {
personModified.setFirstName(first); personModified.setFirstName(first);
} }
if (!personModified.getLastName().equals(last)) { String originalLastName = personModified.getLastName();
if (originalLastName == null || !originalLastName.equals(last)) {
personModified.setLastName(last); personModified.setLastName(last);
} }
if (!personModified.getMetadata("phone").equals(phone)) { String originalPhone = personModified.getMetadata("phone");
if (originalPhone == null || !originalPhone.equals(phone)) {
personModified.setMetadata("phone", phone); personModified.setMetadata("phone", phone);
} }
personModified.setCanLogIn(login); personModified.setCanLogIn(login);

1
dspace/CHANGES
View File

@@ -135,6 +135,7 @@
- [DS-81] Subscription not sent correctly - ID: 2667590 - [DS-81] Subscription not sent correctly - ID: 2667590
- [DS-99] Non-admin user and admin menu options (1.5.1 XMUI only) - ID: 2353606 - [DS-99] Non-admin user and admin menu options (1.5.1 XMUI only) - ID: 2353606
- [DS-157] Ukrainian for DSpace 1.5.2 - JSPUI only (gone into google code) - [DS-157] Ukrainian for DSpace 1.5.2 - JSPUI only (gone into google code)
- [DS-186] NPE during edit of eperson in XMLUI
(Paulo Jobim) (Paulo Jobim)
- [DS-138] SF Patch [2655052] Authors re-ordered when item edited (xmlui) - [DS-138] SF Patch [2655052] Authors re-ordered when item edited (xmlui)