From 742710c0416b2f3442a72da9506004aba0f027f0 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Fri, 16 Sep 2016 16:57:12 +0000 Subject: [PATCH] minor fixes git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@131465 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/ui/CreateDatasetForm.java | 19 ------------------- .../client/ui/CreateDatasetForm.ui.xml | 15 ++------------- .../client/ui/utils/InfoIconsLabels.java | 2 +- .../server/utils/Utils.java | 3 +++ 4 files changed, 6 insertions(+), 33 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 de4d2c8..d799efa 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 @@ -26,7 +26,6 @@ import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.OrganizationBea import com.github.gwtbootstrap.client.ui.AlertBlock; import com.github.gwtbootstrap.client.ui.Button; -import com.github.gwtbootstrap.client.ui.CheckBox; import com.github.gwtbootstrap.client.ui.ControlGroup; import com.github.gwtbootstrap.client.ui.Form; import com.github.gwtbootstrap.client.ui.Icon; @@ -45,7 +44,6 @@ import com.github.gwtbootstrap.client.ui.resources.Bootstrap.Tabs; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.Style.Cursor; -import com.google.gwt.dom.client.Style.Display; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ClickEvent; @@ -121,7 +119,6 @@ public class CreateDatasetForm extends Composite{ @UiField Paragraph selectedProfile; @UiField Button goToDatasetButton; @UiField Button addResourcesButton; - @UiField CheckBox addResourcesCheckBox; @UiField SimplePanel workspaceResourcesContainer; @UiField Button continueThirdStep; @UiField Button goBackButtonFirstStep; @@ -317,8 +314,6 @@ public class CreateDatasetForm extends Composite{ if(isWorkspaceRequest){ - // enable manage resources checkbox - addResourcesCheckBox.getElement().getStyle().setDisplay(Display.INLINE_BLOCK); resourcesTable = new ResourcesTable(bean.getResources()); // if there are not resources, for now just checked it ( and hide so that the step will be skipped) TODO @@ -1155,7 +1150,6 @@ public class CreateDatasetForm extends Composite{ licenseListbox.setEnabled(false); organizationsListbox.setEnabled(false); addCustomFieldButton.setEnabled(false); - addResourcesCheckBox.setEnabled(false); // freeze tags for(int i = 0; i < tagsList.size(); i++){ @@ -1206,19 +1200,6 @@ public class CreateDatasetForm extends Composite{ } } - @UiHandler("addResourcesCheckBox") - void onAddResourcesCheckboxPress(ClickEvent e){ - - // we need to set all resources to be added if checkbox value is true - if(addResourcesCheckBox.getValue()){ - - GWT.log("Set all resources to be add"); - resourcesTable.checkAllResources(true); - - } - - } - @UiHandler("licenseListbox") void onSelectedLicenseChange(ChangeEvent c){ 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 18b1307..aa694c8 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 @@ -55,7 +55,7 @@ - + * Title : @@ -162,7 +162,7 @@ - + Version: @@ -296,19 +296,8 @@ Manage Resources - - - Product - Resources: - - Add folder content as resources - diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/InfoIconsLabels.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/InfoIconsLabels.java index 451921a..a3abd8b 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/InfoIconsLabels.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/utils/InfoIconsLabels.java @@ -52,7 +52,7 @@ public class InfoIconsLabels { // RESOURCES public static final String RESOURCES_INFO_ID_POPUP = "resouces-popup-panel-info"; public static final String RESOURCES_INFO_CAPTION = "Product Resources"; - public static final String RESOURCES_INFO_TEXT = "Automatically add folder content as resources of the product"; + public static final String RESOURCES_INFO_TEXT = "Folder content will be added as resources of the product"; // CUSTOM FIELDS public static final String CUSTOM_FIELDS_INFO_ID_POPUP = "custom-fields-popup-panel-info"; diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/Utils.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/Utils.java index 9769e12..1f03e95 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/Utils.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/Utils.java @@ -319,6 +319,8 @@ public class Utils { // check the scope we need to discover String scopeInWhichDiscover = (scope != null && !scope.isEmpty()) ? scope : aslSession.getScope(); + + logger.debug("Discovering into scope " + scopeInWhichDiscover); // scope in which we need to discover String keyPerScope = UtilMethods.concatenateSessionKeyScope(SessionCatalogueAttributes.CKAN_PROFILES_KEY, scopeInWhichDiscover); @@ -359,6 +361,7 @@ public class Utils { wrapperObj.setValidator(validator.getRegularExpression()); MetadataVocabulary vocabulary = metadataField.getVocabulary(); + if(vocabulary != null){ wrapperObj.setVocabulary(vocabulary.getVocabularyFields()); wrapperObj.setMultiSelection(vocabulary.isMultiSelection());