inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.2) to HEAD (5.2)

Browse Source 
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
This commit is contained in:
Andrei Rebegea
2017-06-15 11:00:13 +00:00
parent 2f42e9814b
commit 2c4c93da43
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
View File

@@ -321,7 +321,7 @@ public class ResultMapper
List<Bucket> buckets = new ArrayList<>(facet.getValue().size()); List<Bucket> buckets = new ArrayList<>(facet.getValue().size());
for (Pair<String, Integer> buck:facet.getValue()) for (Pair<String, Integer> buck:facet.getValue())
{ {
Object display = propertyLookup.lookup(facet.getKey(), buck.getFirst()); Object display = null;
String filterQuery = null; String filterQuery = null;
if (searchQuery != null if (searchQuery != null
&& searchQuery.getFacetFields() != null && searchQuery.getFacetFields() != null
@@ -332,6 +332,7 @@ public class ResultMapper
queryable -> facet.getKey().equals(queryable.getLabel()!=null?queryable.getLabel():queryable.getField())).findFirst(); queryable -> facet.getKey().equals(queryable.getLabel()!=null?queryable.getLabel():queryable.getField())).findFirst();
if (found.isPresent()) if (found.isPresent())
{ {
display = propertyLookup.lookup(found.get().getField(), buck.getFirst());
String fq = found.get().toFilterQuery(buck.getFirst()); String fq = found.get().toFilterQuery(buck.getFirst());
if (fq != null) if (fq != null)
{ {