From 3bf7b03a4b94cc0870ad9db6e1d76077667aa265 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Sat, 22 Oct 2016 15:51:43 +0000 Subject: [PATCH] minor fixes (also changed the go to product button to a link) git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@133400 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/ui/CreateDatasetForm.java | 4 +++- .../client/ui/CreateDatasetForm.ui.xml | 4 ++-- .../ui/dataset/resources/AddResourceToDataset.java | 9 +++++---- .../ui/dataset/resources/AddResourceToDataset.ui.xml | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java index 5a77a52..b21efc2 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java @@ -805,11 +805,13 @@ public class CreateDatasetForm extends Composite{ // show the go to dataset button final String datasetUrl = createdDatasetBean.getSource(); goToDatasetButton.setVisible(true); + goToDatasetButton.setText(datasetUrl); goToDatasetButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { - Window.Location.assign(datasetUrl); + Window.open(datasetUrl, "_blank", ""); + //Window.Location.assign(datasetUrl); } }); diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.ui.xml index 396024f..c5b66d8 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.ui.xml +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.ui.xml @@ -360,8 +360,8 @@ block="true">Go Back - Go to Product + diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/dataset/resources/AddResourceToDataset.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/dataset/resources/AddResourceToDataset.java index 285c8fc..2e073af 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/dataset/resources/AddResourceToDataset.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/dataset/resources/AddResourceToDataset.java @@ -41,7 +41,7 @@ public class AddResourceToDataset extends Composite{ // the dataset id private String datasetId; - + // the dataset organization private String datasetOrg; @@ -62,14 +62,15 @@ public class AddResourceToDataset extends Composite{ // save dataset id (it is needed when we will add resources) this.datasetId = datasetId; - - this.datasetOrg = datasetOrg; + this.datasetOrg = datasetOrg; + goToDatasetButton.setText(datasetUrl); goToDatasetButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { - Window.Location.assign(datasetUrl); + Window.open(datasetUrl, "_blank", ""); + // Window.Location.assign(datasetUrl); } }); } diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/dataset/resources/AddResourceToDataset.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/dataset/resources/AddResourceToDataset.ui.xml index 71f397c..610e525 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/dataset/resources/AddResourceToDataset.ui.xml +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/dataset/resources/AddResourceToDataset.ui.xml @@ -95,7 +95,7 @@ - Go to Product + \ No newline at end of file