diff --git a/dspace/CHANGES b/dspace/CHANGES index e7a77a45ae..bd7a2dea13 100644 --- a/dspace/CHANGES +++ b/dspace/CHANGES @@ -1,8 +1,13 @@ 1.5 alpha 1 =========== -(K. Nakagami) -- SF Patch #1621889 ] for SF Bug #1606789 - When collection is deleted, mapped item remains in community +(Christophe Destin) +- SF Patch #1582754 CreateAdministrator for dummies + Creation of admin via [dspace]/bin/create-administrator for a given email, irrespective of the email + belonging to an allready registered user. +(K. Nakagami) +- SF Patch #1621889 for SF Bug #1606789 When collection is deleted, mapped item remains in community + 1.4.1 final =========== (Tim Donohue) diff --git a/dspace/src/org/dspace/administer/CreateAdministrator.java b/dspace/src/org/dspace/administer/CreateAdministrator.java index 5418ee4b29..ff6ce5c096 100644 --- a/dspace/src/org/dspace/administer/CreateAdministrator.java +++ b/dspace/src/org/dspace/administer/CreateAdministrator.java @@ -148,15 +148,21 @@ public class CreateAdministrator } // Create the administrator e-person - EPerson eperson = EPerson.create(context); - - eperson.setEmail(email); + EPerson eperson = EPerson.findByEmail(context,email); + + // check if the email belongs to a registered user, + // if not create a new user with this email + if (eperson == null) + { + eperson = EPerson.create(context); + eperson.setEmail(email); + eperson.setCanLogIn(true); + eperson.setRequireCertificate(false); + eperson.setSelfRegistered(false); + } eperson.setLastName(lastName); eperson.setFirstName(firstName); eperson.setPassword(password1); - eperson.setCanLogIn(true); - eperson.setRequireCertificate(false); - eperson.setSelfRegistered(false); eperson.update(); admins.addMember(eperson);