From 5d5409019e16ed3f00aecf4eb15b0eb644a6bbdf Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 3 Sep 2014 16:16:41 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 80656: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 77535: Adding first JUnit test of facet config rest api. Part of ACE-1582. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/search/impl/solr/facet/SolrFacetServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImpl.java b/source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImpl.java index 6f8361042c..fc15732eac 100644 --- a/source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImpl.java +++ b/source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImpl.java @@ -83,8 +83,8 @@ public class SolrFacetServiceImpl extends AbstractLifecycleBean implements SolrF /** * The authority that needs to contain the users allowed to administer the faceted-search config. */ - private static final String ALFRESCO_SEARCH_ADMINISTRATORS_AUTHORITY = "ALFRESCO_SEARCH_ADMINISTRATORS"; - private static final String GROUP_ALFRESCO_SEARCH_ADMINISTRATORS_AUTHORITY = PermissionService.GROUP_PREFIX + public static final String ALFRESCO_SEARCH_ADMINISTRATORS_AUTHORITY = "ALFRESCO_SEARCH_ADMINISTRATORS"; + public static final String GROUP_ALFRESCO_SEARCH_ADMINISTRATORS_AUTHORITY = PermissionService.GROUP_PREFIX + ALFRESCO_SEARCH_ADMINISTRATORS_AUTHORITY; /** The store where facets are kept */ @@ -656,6 +656,7 @@ public class SolrFacetServiceImpl extends AbstractLifecycleBean implements SolrF @SuppressWarnings("unchecked") ArrayList facetOrder = (ArrayList) nodeService.getProperty(facetsRoot, SolrFacetModel.PROP_FACET_ORDER); + // FIXME This could be null. // We'll put it at the end (arbitrarily). facetOrder.add(fp.getFilterID());