From 2c4c93da431e7a7866516c20e52e99e394e5cb97 Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Thu, 15 Jun 2017 11:00:13 +0000 Subject: [PATCH] Merged 5.2.N (5.2.2) to HEAD (5.2) 136094 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1) 135773 gjames: SEARCH-372: Reworking filterQuery fieldfacet label support git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137466 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/rest/api/search/impl/ResultMapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java b/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java index 45d56fdf50..92bf15600b 100644 --- a/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java +++ b/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java @@ -321,7 +321,7 @@ public class ResultMapper List buckets = new ArrayList<>(facet.getValue().size()); for (Pair buck:facet.getValue()) { - Object display = propertyLookup.lookup(facet.getKey(), buck.getFirst()); + Object display = null; String filterQuery = null; if (searchQuery != null && searchQuery.getFacetFields() != null @@ -332,6 +332,7 @@ public class ResultMapper queryable -> facet.getKey().equals(queryable.getLabel()!=null?queryable.getLabel():queryable.getField())).findFirst(); if (found.isPresent()) { + display = propertyLookup.lookup(found.get().getField(), buck.getFirst()); String fq = found.get().toFilterQuery(buck.getFirst()); if (fq != null) {