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 (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
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
This commit is contained in:
Will Abson
2014-09-03 16:16:41 +00:00
parent 3a8e6c7309
commit 5d5409019e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetServiceImpl.java
View File

@@ -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. * 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"; public 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 GROUP_ALFRESCO_SEARCH_ADMINISTRATORS_AUTHORITY = PermissionService.GROUP_PREFIX
+ ALFRESCO_SEARCH_ADMINISTRATORS_AUTHORITY; + ALFRESCO_SEARCH_ADMINISTRATORS_AUTHORITY;
/** The store where facets are kept */ /** The store where facets are kept */
@@ -656,6 +656,7 @@ public class SolrFacetServiceImpl extends AbstractLifecycleBean implements SolrF
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
ArrayList<String> facetOrder = (ArrayList<String>) nodeService.getProperty(facetsRoot, SolrFacetModel.PROP_FACET_ORDER); ArrayList<String> facetOrder = (ArrayList<String>) nodeService.getProperty(facetsRoot, SolrFacetModel.PROP_FACET_ORDER);
// FIXME This could be null.
// We'll put it at the end (arbitrarily). // We'll put it at the end (arbitrarily).
facetOrder.add(fp.getFilterID()); facetOrder.add(fp.getFilterID());