Commit aab88e1c authored by Matija Obreza's avatar Matija Obreza

Merge branch 'ui-533-descriptor-selector-filters' into 'master'

Descriptor selector: filters for columnName and versionTag added

See merge request genesys-pgr/genesys-server!469
parents 120a3c25 81349e70
......@@ -52,7 +52,10 @@ public class DescriptorFilter extends UuidModelFilter<DescriptorFilter, Descript
public StringFilter description;
/** The column name. */
public StringFilter columnName;
public Set<String> columnName;
/** The version tag. */
public Set<String> versionTag;
/** The bibliographic citation. */
public StringFilter bibliographicCitation;
......@@ -127,8 +130,11 @@ public class DescriptorFilter extends UuidModelFilter<DescriptorFilter, Descript
if (description != null) {
and.and(description.buildQuery(descriptorPath.description));
}
if (columnName != null) {
and.and(columnName.buildQuery(descriptorPath.columnName));
if (columnName != null && !columnName.isEmpty()) {
and.and(descriptorPath.columnName.in(columnName));
}
if (versionTag != null && !versionTag.isEmpty()) {
and.and(descriptorPath.versionTag.in(versionTag));
}
if (uom != null && !uom.isEmpty()) {
and.and(descriptorPath.uom.in(uom));
......
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