diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 7dc2878..9a48316 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,15 +4,9 @@ - - uses - uses - - uses - diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java index a81ac97..53076dd 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java @@ -81,7 +81,8 @@ public class CkanEventHandlerManager { @Override public void onShowHome(ShowHomeEvent showHomeEvent) { - String request = getCkanRequest(panel.getPathInfo(), null); + String pathToUse = panel.isViewPerVREEnabled() ? panel.getPathInfo() : null; + String request = getCkanRequest(pathToUse, null); panel.instanceCkanFrame(request); } 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 130d99e..5299ff7 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 @@ -50,6 +50,7 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate { private HandlerManager eventBus; private CkanConnectorAccessPoint ckanAccessPoint; private boolean isManageProductToShow = false; + private String viewPerVREPath = null; private static String latestSelectedProductIdentifier; public static final int IFRAME_FIX_HEIGHT = 1800; private JSONObject obj; @@ -163,6 +164,9 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate { // set real relative path ckanAccessPoint.addPathInfo(result); + + // save this information + viewPerVREPath = result; } } @@ -530,4 +534,12 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate { managementPanel.showManageProductButton(show); } + + /** + * Check if the view per vre is enabled + */ + public boolean isViewPerVREEnabled() { + return viewPerVREPath != null; + } + }