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

fix conflict

Browse Source
This commit is contained in:
Tom Desair
2016-04-07 16:31:10 +02:00
committed by dylan
parent b19189634d
commit 8db0faed33
102 changed files with 665 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
View File

@@ -361,8 +361,6 @@ public class GroupServiceImpl extends DSpaceObjectServiceImpl<Group> implements
ePerson.getGroups().remove(group);
}
deleteMetadata(context, group);
// empty out group2groupcache table (if we do it after we delete our object we get an issue with references)
group2GroupCacheDAO.deleteAll(context);
// Remove ourself
@@ -467,7 +465,7 @@ public class GroupServiceImpl extends DSpaceObjectServiceImpl<Group> implements
protected boolean epersonInGroup(Context context, String groupName, EPerson ePerson)
throws SQLException
{
return groupDAO.findByNameAndEPerson(context, groupName, ePerson) != null;
return groupDAO.findByNameAndMembership(context, groupName, ePerson) != null;
}