From 499086b882a2b744b5992991af74dc6bd0d60803 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Mon, 26 Dec 2016 21:07:05 +0000 Subject: [PATCH] minor fix when retrieving groups list git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@141404 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/ui/CreateDatasetForm.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 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 8a00554..aac09cf 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 @@ -434,9 +434,7 @@ public class CreateDatasetForm extends Composite{ for (GroupBean group : groups) { groupsListbox.addItem(group.getGroupTitle(), group.getGroupName()); } - hideGroupsAlreadyInProfile(profiles); - groupsControlGroup.setVisible(true); } // everything went ok setAlertBlock("", AlertType.ERROR, false); @@ -492,6 +490,7 @@ public class CreateDatasetForm extends Composite{ organizationsListbox.setEnabled(false); metadataProfilesFormatListbox.setEnabled(false); groupsListbox.setEnabled(false); + groupsListbox.clear(); groupsControlGroup.setVisible(false); // perform remote request of profiles for the selected organization @@ -506,7 +505,6 @@ public class CreateDatasetForm extends Composite{ prepareMetadataList(receivedBean); organizationsListbox.setEnabled(true); metadataProfilesFormatListbox.setEnabled(true); - groupsListbox.setEnabled(true); // try to retrieve the licenses setAlertBlock("Retrieving groups, please wait...", AlertType.INFO, true); @@ -529,12 +527,9 @@ public class CreateDatasetForm extends Composite{ for (GroupBean group : groups) { groupsListbox.addItem(group.getGroupTitle(), group.getGroupName()); } - - hideGroupsAlreadyInProfile(profiles); groupsListbox.setEnabled(true); - groupsControlGroup.setVisible(true); + hideGroupsAlreadyInProfile(profiles); } - // everything went ok setAlertBlock("", AlertType.ERROR, false); } } @@ -1368,11 +1363,18 @@ public class CreateDatasetForm extends Composite{ SelectElement se = groupsListbox.getElement().cast(); + int hiddenElements = 0; for (int i = 0; i < groupsListbox.getItemCount(); i++) { if(groupsToHide.contains(groupsListbox.getItemText(i))){ se.getOptions().getItem(i).getStyle().setProperty("display", "none"); + hiddenElements++; } } + if(hiddenElements == groupsListbox.getItemCount()) + groupsControlGroup.setVisible(false); + else + groupsControlGroup.setVisible(true); + } }