From 55268c43b4f2c77086cc85e41729ecf4c4469df4 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Wed, 2 Aug 2017 12:16:50 +0000 Subject: [PATCH] minor changes git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/widgets/grsf-manage-widget@152419 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../grsf_manage_widget/client/view/ManageProductWidget.java | 5 +++++ .../client/view/ManageProductWidget.ui.xml | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.java b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.java index 1a9fcd9..2b43192 100644 --- a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.java +++ b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.java @@ -178,6 +178,11 @@ public class ManageProductWidget extends Composite{ List statusToShow = new ArrayList(STATUS); statusToShow.remove(bean.getCurrentStatus()); + + // if the record isn't approved, then remove also archived + if(!bean.getCurrentStatus().equals(GRSFStatus.Approved)) + statusToShow.remove(GRSFStatus.Archived); + listBoxStatus.addItem("Select the new status"); listBoxStatus.getElement().cast().getOptions().getItem(0).setDisabled(true); for (GRSFStatus availableStatus : statusToShow) { diff --git a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.ui.xml b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.ui.xml index 12fba39..29d2240 100644 --- a/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.ui.xml +++ b/src/main/java/org/gcube/datacatalogue/grsf_manage_widget/client/view/ManageProductWidget.ui.xml @@ -72,7 +72,7 @@ Source(s): - @@ -94,14 +94,14 @@ - + New Status: