mirror of
https://github.com/DSpace/DSpace.git
synced 2025-10-07 10:04:21 +00:00
minor modifications to group membership analysis so that it actually works
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2921 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
@@ -236,6 +236,18 @@ public abstract class DSpaceObject implements Identifiable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean contains(List<? extends DSpaceObject> dsos, DSpaceObject dso)
|
||||||
|
{
|
||||||
|
for (DSpaceObject obj : dsos)
|
||||||
|
{
|
||||||
|
if (obj.equals(dso))
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
public int hashCode()
|
public int hashCode()
|
||||||
{
|
{
|
||||||
return HashCodeBuilder.reflectionHashCode(this);
|
return HashCodeBuilder.reflectionHashCode(this);
|
||||||
|
@@ -169,12 +169,12 @@ public class Group extends DSpaceObject
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return epeople.contains(e);
|
return this.contains(epeople, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isMember(Group g)
|
public boolean isMember(Group g)
|
||||||
{
|
{
|
||||||
return groups.contains(g);
|
return this.contains(groups, g);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Group[] getMemberGroups()
|
public Group[] getMemberGroups()
|
||||||
|
@@ -155,7 +155,7 @@ public class GroupProxy extends Group
|
|||||||
loadEPeople();
|
loadEPeople();
|
||||||
}
|
}
|
||||||
|
|
||||||
return epeople.contains(e);
|
return this.contains(epeople, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -166,7 +166,7 @@ public class GroupProxy extends Group
|
|||||||
loadGroups();
|
loadGroups();
|
||||||
}
|
}
|
||||||
|
|
||||||
return groups.contains(g);
|
return this.contains(groups, g);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Reference in New Issue
Block a user