From 738f4f4435d688d2c457ae1c52dd9fd90258144b Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 3 Feb 2017 17:06:49 +0000 Subject: [PATCH] git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/gcube-ckan-datacatalog@142208 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../view/GCubeCkanDataCatalogPanel.java | 18 ++++++++++- .../GcubeCkanDataCatalogServiceImpl.java | 11 ++++--- .../shared/CkanConnectorAccessPoint.java | 32 ++++++++++++++++--- 3 files changed, 51 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java index c9ddb2b..9b177d0 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java @@ -97,6 +97,10 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate { instanceCkanFrame(ckan.buildURI()); GCubeCkanDataCatalogPanel.this.rootPanel.remove(loading); + if(ckan.isOutsideFromPortal()) + hideHeaderSection(); + + // now perform the other requests GCubeCkanDataCatalog.service.outsidePortal(new AsyncCallback() { @@ -174,7 +178,7 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate { @Override public void onSuccess(Boolean result) { - isManageProductToShow = result; + isManageProductToShow = result; managementPanel.showManageProductButton(isManageProductToShow); } @@ -223,6 +227,18 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate { listenForPostMessage(); } + private native void hideHeaderSection() /*-{ + + var e = $wnd.$doc.getElementByTagName('
'); + console.log('header : '+e); + if(e){ + console.log('header found'); + e.style.visibility = 'hidden'; + } + + }-*/; + + public static String getLatestSelectedProductIdentifier(){ return latestSelectedProductIdentifier; } diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java index d837ec5..a02b41d 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java @@ -120,6 +120,7 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem if(outsidePortal()){ CkanConnectorAccessPoint ckan = new CkanConnectorAccessPoint(getCatalogue(scopePerCurrentUrl).getCatalogueUrl(),""); + ckan.setOutsideFromPortal(true); return ckan; } @@ -164,8 +165,8 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem // retrieve the list of VREs to whom the user belongs (actually one vre at most is sent) Map roleForVre = UserUtil.getVreRoleForUser( - SessionUtil.getCurrentUser(getThreadLocalRequest()).getEmail(), - scopePerCurrentUrl, + SessionUtil.getCurrentUser(getThreadLocalRequest()).getEmail(), + scopePerCurrentUrl, getCatalogue(scopePerCurrentUrl)); ckan.addListOfVREs(roleForVre); @@ -262,7 +263,7 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem /** * Fetch the list of ckan groups for which the user is member - * @param context + * @param context * @return */ private List fetchUserGroups(String context, String username) { @@ -279,7 +280,7 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem for (Entry> entry : set) { Set> subSet = entry.getValue().entrySet(); for (Entry subEntry : subSet) { - toReturn.add(new GroupBean(subEntry.getKey().getTitle(), subEntry.getKey().getName())); + toReturn.add(new GroupBean(subEntry.getKey().getTitle(), subEntry.getKey().getName())); } } @@ -530,7 +531,7 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem try{ PortalContext pContext = PortalContext.getConfiguration(); List userRoles = new LiferayRoleManager().listRolesByUserAndGroup( - pContext.getCurrentUser(getThreadLocalRequest()).getUserId(), + pContext.getCurrentUser(getThreadLocalRequest()).getUserId(), pContext.getCurrentGroupId(getThreadLocalRequest())); boolean isGRSFAdminRoleSet = false; for (GCubeRole gCubeRole : userRoles) { diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/shared/CkanConnectorAccessPoint.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/shared/CkanConnectorAccessPoint.java index 3aac10c..973a931 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/shared/CkanConnectorAccessPoint.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/shared/CkanConnectorAccessPoint.java @@ -35,6 +35,8 @@ public class CkanConnectorAccessPoint implements Serializable{ private Map mapVresRoles; private String serverviceContext; + private boolean outsideFromPortal = false; + /** * Instantiates a new ckan connector access point. */ @@ -237,6 +239,28 @@ public class CkanConnectorAccessPoint implements Serializable{ return value; } + + + + /** + * @return the outsideFromPortal + */ + public boolean isOutsideFromPortal() { + + return outsideFromPortal; + } + + + + /** + * @param outsideFromPortal the outsideFromPortal to set + */ + public void setOutsideFromPortal(boolean outsideFromPortal) { + + this.outsideFromPortal = outsideFromPortal; + } + + /* (non-Javadoc) * @see java.lang.Object#toString() */ @@ -250,12 +274,12 @@ public class CkanConnectorAccessPoint implements Serializable{ builder.append(pathInfoParameter); builder.append(", queryStringParameters="); builder.append(queryStringParameters); - builder.append(", gcubeTokenValue="); - builder.append(gcubeTokenValue); - builder.append(", listOfVRes="); + builder.append(", mapVresRoles="); builder.append(mapVresRoles); - builder.append(", context="); + builder.append(", serverviceContext="); builder.append(serverviceContext); + builder.append(", outsideFromPortal="); + builder.append(outsideFromPortal); builder.append("]"); return builder.toString(); }