Minor Update
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager@119440 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
68bebe3031
commit
ea4dec6527
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue