diff --git a/src/main/java/org/gcube/portlets/user/vlabs/Utils.java b/src/main/java/org/gcube/portlets/user/vlabs/Utils.java index fc71f93..165021d 100644 --- a/src/main/java/org/gcube/portlets/user/vlabs/Utils.java +++ b/src/main/java/org/gcube/portlets/user/vlabs/Utils.java @@ -36,8 +36,10 @@ public class Utils { toReturn.setAccessPolicy(ap); long[] userGroupIds = currentUser.getGroupIds(); for (int i = 0; i < userGroupIds.length; i++) { - if (groupId == userGroupIds[i]) - toReturn.setFriendlyURL(GCubePortalConstants.PREFIX_GROUP_URL +GroupLocalServiceUtil.getGroup(groupId).getFriendlyURL()); + if (groupId == userGroupIds[i]) { + String privatePagesURL = GCubePortalConstants.PREFIX_GROUP_URL +GroupLocalServiceUtil.getGroup(groupId).getFriendlyURL(); + toReturn.setFriendlyURL(privatePagesURL); + } } } } catch (Exception e) { diff --git a/src/main/webapp/html/vlabsdisplay/view.jsp b/src/main/webapp/html/vlabsdisplay/view.jsp index 27a3ec2..9ef4ca5 100644 --- a/src/main/webapp/html/vlabsdisplay/view.jsp +++ b/src/main/webapp/html/vlabsdisplay/view.jsp @@ -61,22 +61,40 @@ pageContext.setAttribute("ap3",ap3); String url4 = GetterUtil.getString(portletPreferences.getValue("vlab4-Url", StringPool.BLANK)); - pageContext.setAttribute("vlab4Url", Utils.getVLabBean(currentUser, url4).getFriendlyURL()); + VLabBean vLabBean4 = Utils.getVLabBean(currentUser, url4); + pageContext.setAttribute("vlab4Url", vLabBean4.getFriendlyURL()); + String ap4 = vLabBean4.getAccessPolicy().toString().toLowerCase(); + pageContext.setAttribute("ap4",ap4); String url5 = GetterUtil.getString(portletPreferences.getValue("vlab5-Url", StringPool.BLANK)); - pageContext.setAttribute("vlab5Url", Utils.getVLabBean(currentUser, url5).getFriendlyURL()); + VLabBean vLabBean5 = Utils.getVLabBean(currentUser, url5); + pageContext.setAttribute("vlab5Url", vLabBean5.getFriendlyURL()); + String ap5 = vLabBean5.getAccessPolicy().toString().toLowerCase(); + pageContext.setAttribute("ap5",ap5); String url6 = GetterUtil.getString(portletPreferences.getValue("vlab6-Url", StringPool.BLANK)); - pageContext.setAttribute("vlab6Url", Utils.getVLabBean(currentUser, url6).getFriendlyURL()); + VLabBean vLabBean6 = Utils.getVLabBean(currentUser, url6); + pageContext.setAttribute("vlab6Url", vLabBean6.getFriendlyURL()); + String ap6 = vLabBean6.getAccessPolicy().toString().toLowerCase(); + pageContext.setAttribute("ap6",ap6); String url7 = GetterUtil.getString(portletPreferences.getValue("vlab7-Url", StringPool.BLANK)); - pageContext.setAttribute("vlab7Url", Utils.getVLabBean(currentUser, url7).getFriendlyURL()); + VLabBean vLabBean7 = Utils.getVLabBean(currentUser, url7); + pageContext.setAttribute("vlab7Url", vLabBean7.getFriendlyURL()); + String ap7 = vLabBean7.getAccessPolicy().toString().toLowerCase(); + pageContext.setAttribute("ap7",ap7); String url8 = GetterUtil.getString(portletPreferences.getValue("vlab8-Url", StringPool.BLANK)); - pageContext.setAttribute("vlab8Url", Utils.getVLabBean(currentUser, url8).getFriendlyURL()); + VLabBean vLabBean8 = Utils.getVLabBean(currentUser, url8); + pageContext.setAttribute("vlab8Url", vLabBean8.getFriendlyURL()); + String ap8 = vLabBean8.getAccessPolicy().toString().toLowerCase(); + pageContext.setAttribute("ap8",ap8); String url9 = GetterUtil.getString(portletPreferences.getValue("vlab9-Url", StringPool.BLANK)); - pageContext.setAttribute("vlab9Url", Utils.getVLabBean(currentUser, url9).getFriendlyURL()); + VLabBean vLabBean9 = Utils.getVLabBean(currentUser, url9); + pageContext.setAttribute("vlab9Url", vLabBean9.getFriendlyURL()); + String ap9 = vLabBean9.getAccessPolicy().toString().toLowerCase(); + pageContext.setAttribute("ap9",ap9); String content1 = ""; if (vlabName1DocumentId > 0) {