Commit 83505ccf authored by Matija Obreza's avatar Matija Obreza
Browse files

FIX: Keyword filter on more fields

parent ba248a95
......@@ -99,6 +99,9 @@ public class DatasetFilter extends AuditedVersionedModelFilter {
),
FilterHelpers.containsAll(_text,
dataset.title, dataset.description,
dataset.creators.any().fullName,
dataset.locations.any().verbatimLocality,
dataset.repositoryFiles.any().title, dataset.repositoryFiles.any().originalFilename,
dataset.owner.name,
dataset.descriptors.any().title
)
......
......@@ -150,12 +150,12 @@ public class DescriptorFilter extends AuditedVersionedModelFilter {
FilterHelpers.equalsAny(_text,
descriptor.crop, descriptor.versionTag, descriptor.publisher,
descriptor.owner.shortName,
descriptor.descriptorLists.any().publisher, descriptor.descriptorLists.any().versionTag, descriptor.descriptorLists.any().crop,
descriptor.descriptorLists.any().title
descriptor.descriptorLists.any().publisher, descriptor.descriptorLists.any().versionTag, descriptor.descriptorLists.any().crop
),
FilterHelpers.containsAll(_text,
descriptor.title, descriptor.description, descriptor.bibliographicCitation,
descriptor.owner.name
descriptor.owner.name,
descriptor.descriptorLists.any().title
)
)
);
......
......@@ -99,7 +99,7 @@ public class DescriptorListFilter extends AuditedVersionedModelFilter {
FilterHelpers.equalsAny(_text,
descriptorList.crop, descriptorList.versionTag, descriptorList.publisher,
descriptorList.owner.shortName,
descriptorList.descriptors.any().crop, descriptorList.descriptors.any().versionTag
descriptorList.descriptors.any().crop, descriptorList.descriptors.any().versionTag, descriptorList.descriptors.any().publisher
),
FilterHelpers.containsAll(_text,
descriptorList.title, descriptorList.description, descriptorList.bibliographicCitation,
......
Supports Markdown
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