diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java index ea73bf5b5..2cbd26299 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java @@ -119,7 +119,6 @@ public class BandboxMultipleSearch extends HtmlMacroComponent { final String inputText = ((InputEvent) event).getValue(); if ((inputText == null) || (inputText.isEmpty())) { clear(); - searchMultipleFilters(); } else { searchMultipleFilters(inputText); } @@ -195,6 +194,8 @@ public class BandboxMultipleSearch extends HtmlMacroComponent { bandbox.setValue(""); selectedFiltersText = ""; selectedFilters.clear(); + multipleFiltersFinder.reset(); + searchMultipleFilters(); } public void addSelectedElement(Object obj) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/IMultipleFiltersFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/IMultipleFiltersFinder.java index 10035b714..61430d87c 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/IMultipleFiltersFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/IMultipleFiltersFinder.java @@ -59,4 +59,6 @@ public interface IMultipleFiltersFinder { ListitemRenderer getItemRenderer(); + void reset(); + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java index c0f9b04cc..604f18ca0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java @@ -20,8 +20,6 @@ package org.navalplanner.web.common.components.finders; -import static org.navalplanner.web.I18nHelper._; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; @@ -50,6 +48,9 @@ public abstract class MultipleFiltersFinder implements IMultipleFiltersFinder { MultipleFiltersFinder() { } + public void reset() { + } + public IAdHocTransactionService getAdHocTransactionService() { return adHocTransactionService; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationMultipleFiltersFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationMultipleFiltersFinder.java index 6d642a5dd..11e3cd273 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationMultipleFiltersFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationMultipleFiltersFinder.java @@ -57,6 +57,10 @@ public class ResourceAllocationMultipleFiltersFinder extends this.isLimitingResourceAllocation = isLimitingResourceAllocation; } + public void reset() { + this.mode = FilterEnumNone.None; + } + public List getFirstTenFilters() { getListMatching().clear(); if (!isModeResource()) {