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 
137088 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      137016 gjames: SEARCH-340: Changing range tags to label


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:19:31 +00:00
parent 58722b6198
commit b2be228977
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
View File

@@ -638,7 +638,7 @@ public class SearchMapper
{ {
for (RangeParameters aRange:ranges) for (RangeParameters aRange:ranges)
{ {
if (aRange.getTags().contains(aPivot.getKey())) if (aPivot.getKey().equals(aRange.getLabel()))
{ {
pivotKey = aPivot.getKey(); pivotKey = aPivot.getKey();
if (pivotKeys.isEmpty()) if (pivotKeys.isEmpty())

2
source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
View File

@@ -947,7 +947,7 @@ public class SearchMapperTests
facets.add(new FacetField("king",null,null,null,null,null,null,null,null,null,null)); facets.add(new FacetField("king",null,null,null,null,null,null,null,null,null,null));
facets.add(new FacetField("kong",null,null,null,null,null,null,null,null,null,null)); facets.add(new FacetField("kong",null,null,null,null,null,null,null,null,null,null));
ff = new FacetFields(facets); ff = new FacetFields(facets);
rangeParams.add(new RangeParameters("content.size", "0", "100000", "1000",true,null,null,Arrays.asList("hope"),null)); rangeParams.add(new RangeParameters("content.size", "0", "100000", "1000",true,null,null,"hope",null));
searchMapper.fromPivot(searchParameters, Arrays.asList(bobf), ff, rangeParams, searchMapper.fromPivot(searchParameters, Arrays.asList(bobf), ff, rangeParams,
Arrays.asList(new Pivot("king", Arrays.asList(new Pivot("bob", null))), new Pivot("kong", Arrays.asList(new Pivot("hope", null)))), searchRequestContext); Arrays.asList(new Pivot("king", Arrays.asList(new Pivot("bob", null))), new Pivot("kong", Arrays.asList(new Pivot("hope", null)))), searchRequestContext);
assertEquals(2 ,searchParameters.getPivots().size()); assertEquals(2 ,searchParameters.getPivots().size());