gCubeSystem
/
gcube-ckan-datacatalog
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix for #11210 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/gcube-ckan-datacatalog@164449 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Costantino Perciante 2018-02-20 14:51:25 +00:00
parent f9710ffbb5
commit 1aa6abb031
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.settings/org.eclipse.wst.common.component
View File

@ -4,15 +4,9 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="grsf-manage-widget-1.3.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/grsf-manage-widget/grsf-manage-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="grsf-common-library-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/grsf-common-library/grsf-common-library"> <dependent-module archiveName="grsf-common-library-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/grsf-common-library/grsf-common-library">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="ckan-metadata-publisher-widget-1.3.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-metadata-publisher-widget/ckan-metadata-publisher-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="gcube-ckan-datacatalog"/> <property name="context-root" value="gcube-ckan-datacatalog"/>
<property name="java-output-path" value="/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-1.0.0-SNAPSHOT/WEB-INF/classes"/> <property name="java-output-path" value="/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-1.0.0-SNAPSHOT/WEB-INF/classes"/>
</wb-module> </wb-module>

3
src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/CkanEventHandlerManager.java
View File

@ -81,7 +81,8 @@ public class CkanEventHandlerManager {
@Override @Override
public void onShowHome(ShowHomeEvent showHomeEvent) { 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); panel.instanceCkanFrame(request);
} }

12
src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java
View File

@ -50,6 +50,7 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate {
private HandlerManager eventBus; private HandlerManager eventBus;
private CkanConnectorAccessPoint ckanAccessPoint; private CkanConnectorAccessPoint ckanAccessPoint;
private boolean isManageProductToShow = false; private boolean isManageProductToShow = false;
private String viewPerVREPath = null;
private static String latestSelectedProductIdentifier; private static String latestSelectedProductIdentifier;
public static final int IFRAME_FIX_HEIGHT = 1800; public static final int IFRAME_FIX_HEIGHT = 1800;
private JSONObject obj; private JSONObject obj;
@ -163,6 +164,9 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate {
// set real relative path // set real relative path
ckanAccessPoint.addPathInfo(result); ckanAccessPoint.addPathInfo(result);
// save this information
viewPerVREPath = result;
} }
} }
@ -530,4 +534,12 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate {
managementPanel.showManageProductButton(show); managementPanel.showManageProductButton(show);
} }
/**
* Check if the view per vre is enabled
*/
public boolean isViewPerVREEnabled() {
return viewPerVREPath != null;
}
} }