Commit 9cf1082a authored by Matija Obreza's avatar Matija Obreza

Merge branch 'ui-372-descriptor-lists-browser' into 'master'

changed DescriptorListFilter.publisher to StringFiler

See merge request genesys-pgr/genesys-server!248
parents e59ee0d3 fdce2627
......@@ -60,7 +60,7 @@ public class DescriptorListFilter extends UuidModelFilter<DescriptorListFilter,
public Set<PublishState> state;
/** The publisher. */
public Set<String> publisher;
public StringFilter publisher;
/**
* Builds the query.
......@@ -77,8 +77,8 @@ public class DescriptorListFilter extends UuidModelFilter<DescriptorListFilter,
if (state != null && !state.isEmpty()) {
and.and(descriptorList.state.in(state));
}
if (publisher != null && !publisher.isEmpty()) {
and.and(descriptorList.publisher.in(publisher));
if (publisher != null) {
and.and(publisher.buildQuery(descriptorList.publisher));
}
if (title != null) {
and.and(title.buildQuery(descriptorList.title));
......
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