fix for request based group VRE
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/vo-management/usermanagement-core@126057 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
0ae9bd353b
commit
63f6964602
|
@ -56,7 +56,7 @@ public class LiferayGroupManager implements GroupManager {
|
||||||
if (g != null) {
|
if (g != null) {
|
||||||
long logoId = LayoutSetLocalServiceUtil.getLayoutSet(g.getGroupId(), true).getLogoId();
|
long logoId = LayoutSetLocalServiceUtil.getLayoutSet(g.getGroupId(), true).getLogoId();
|
||||||
if (isVRE(g.getGroupId())) {
|
if (isVRE(g.getGroupId())) {
|
||||||
return new GCubeGroup(g.getGroupId(), g.getParentGroupId(), g.getName(), g.getDescription(), g.getFriendlyURL(), logoId, null);
|
return new GCubeGroup(g.getGroupId(), g.getParentGroupId(), g.getName(), g.getDescription(), g.getFriendlyURL(), logoId, null, g.getType()==GroupConstants.TYPE_SITE_RESTRICTED);
|
||||||
}
|
}
|
||||||
else if (isVO(g.getGroupId())) {
|
else if (isVO(g.getGroupId())) {
|
||||||
List<GCubeGroup> vres = new ArrayList<GCubeGroup>();
|
List<GCubeGroup> vres = new ArrayList<GCubeGroup>();
|
||||||
|
@ -64,7 +64,7 @@ public class LiferayGroupManager implements GroupManager {
|
||||||
for (Group vre : VREs) {
|
for (Group vre : VREs) {
|
||||||
vres.add(mapLRGroup(vre));
|
vres.add(mapLRGroup(vre));
|
||||||
}
|
}
|
||||||
return new GCubeGroup(g.getGroupId(), g.getParentGroupId(), g.getName(), g.getDescription(), g.getFriendlyURL(), logoId, vres);
|
return new GCubeGroup(g.getGroupId(), g.getParentGroupId(), g.getName(), g.getDescription(), g.getFriendlyURL(), logoId, vres, g.getType()==GroupConstants.TYPE_SITE_RESTRICTED);
|
||||||
} else if (isRootVO(g.getGroupId())) {
|
} else if (isRootVO(g.getGroupId())) {
|
||||||
List<GCubeGroup> vos = new ArrayList<GCubeGroup>();
|
List<GCubeGroup> vos = new ArrayList<GCubeGroup>();
|
||||||
List<Group> children = g.getChildren(true);
|
List<Group> children = g.getChildren(true);
|
||||||
|
|
Loading…
Reference in New Issue