Mercurial > dive4elements > river
diff gwt-client/src/main/java/org/dive4elements/river/client/client/ui/DistancePanel.java @ 7731:91a57b66c7ed
Client side fix for flys/issue1549
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Mon, 20 Jan 2014 12:44:16 +0100 |
parents | afa531aca3de |
children | 1d6b957d8953 |
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/DistancePanel.java Mon Jan 13 11:52:22 2014 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/DistancePanel.java Mon Jan 20 12:44:16 2014 +0100 @@ -598,22 +598,28 @@ Criterion combinedFilter = null; Criterion locationFilter = null; + if (from.equals(Float.NaN) && to.equals(Float.NaN)) { locationsTable.clearCriteria(); distancesTable.clearCriteria(); filterResultCount.setValue(""); return; } - else if (from.equals(Float.NaN)) { - combinedFilter = new Criterion("to", OperatorId.LESS_OR_EQUAL, to); + + if (from.equals(Float.NaN)) { + combinedFilter = + new Criterion("to", OperatorId.LESS_OR_EQUAL, to); + locationFilter = new Criterion("from", OperatorId.LESS_OR_EQUAL, to); + locationsTable.filterData(locationFilter); distancesTable.filterData(combinedFilter); filterResultCount.setValue(currentFiltered.getRecords().length); return; } - else if (to.equals(Float.NaN)) { + + if (to.equals(Float.NaN)) { combinedFilter = new Criterion("from", OperatorId.GREATER_OR_EQUAL, from); }