From ea4dec6527bda13c635ab71e1335f5a222b20748 Mon Sep 17 00:00:00 2001 From: "giancarlo.panichi" Date: Tue, 6 Oct 2015 12:44:20 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager@119440 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/filters/ActiveFiltersPanel.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/ActiveFiltersPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/ActiveFiltersPanel.java index ce3485b..d5df166 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/ActiveFiltersPanel.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/ActiveFiltersPanel.java @@ -495,7 +495,7 @@ public class ActiveFiltersPanel extends SimpleContainer { } } - private void retrieveFilterValuesByKey(FilterKey filterKey) { + private void retrieveFilterValuesByKey(FilterKey filterKey, final boolean cancelValue) { FilterValuesRequest requestFilterValue = new FilterValuesRequest( filterKey, accountingStateData.getAccountingType()); @@ -524,6 +524,9 @@ public class ActiveFiltersPanel extends SimpleContainer { for(FilterValue fv:result){ values.add(fv.getValue()); } + if(cancelValue){ + comboFilterValue.clear(); + } storeComboFilterValue.clear(); storeComboFilterValue.addAll(values); storeComboFilterValue.commitChanges(); @@ -564,7 +567,7 @@ public class ActiveFiltersPanel extends SimpleContainer { storeComboFilterKey.commitChanges(); if (editingFilter.getFilterKey() != null) { - retrieveFilterValuesByKey(editingFilter.getFilterKey()); + retrieveFilterValuesByKey(editingFilter.getFilterKey(), false); } addButton.setEnabled(false); @@ -583,7 +586,7 @@ public class ActiveFiltersPanel extends SimpleContainer { } private void updateFilterKey(FilterKey selectedFilterKey) { - retrieveFilterValuesByKey(selectedFilterKey); + retrieveFilterValuesByKey(selectedFilterKey, true); } }