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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
70692: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69799: ACE-1605: Fixed Created and Modified date filters.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Draper
2014-05-19 12:52:21 +00:00
parent dcdfa645c1
commit cf0542eb10
2 changed files with 130 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/repo/jscript/Search.java
View File

@@ -711,8 +711,16 @@ public class Search extends BaseScopableProcessorExtension implements Initializi
{
sp.addFieldFacet(new FieldFacet("@" + field));
}
List<String> facetQueries = solrFacetHelper.getFacetQueries();
List<String> facetQueries = null;
// Workaround for ACE-1605
if (query.indexOf("created:") < 0 && query.indexOf("modified:") < 0)
{
facetQueries = solrFacetHelper.getDefaultFacetQueries();
}
else
{
facetQueries = solrFacetHelper.createFacetQueriesFromSearchQuery(query);
}
for (String fq : facetQueries)
{
sp.addFacetQuery(fq);