Commit 701ff1b0 authored by Matija Obreza's avatar Matija Obreza

Merge branch 'ui-685-country-evaluation-filter-on-the-datasets-page-exclude-function' into 'master'

Country evaluation filter on the /datasets page (exclude function);

See merge request genesys-pgr/genesys-server!530
parents a01258ea 229df24f
......@@ -118,7 +118,7 @@ public class DatasetFilter extends UuidModelFilter<DatasetFilter, Dataset> imple
predicates.add(dataset.crops.any().in(crops));
}
if (locations != null) {
predicates.add(dataset.locations.isNotEmpty());
// predicates.add(dataset.locations.isNotEmpty()); // is an element collection
predicates.addAll(locations.collectPredicates(dataset.locations.any()));
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment