From e0b69f6ca7668c946df078c749448eb38689902a Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Sat, 20 Sep 2014 09:26:40 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 84954: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 83702: ACE-2639. Added javadoc stating that inherited properties are included in results for a single type/aspect, which they are. Added content class qname (type/aspect) to the JSON rsp as it's very helpful. Improved FacetablePropertyData's compareTo impl to properly sort on model,type,prop. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85271 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/search/impl/solr/facet/SolrFacetService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetService.java b/source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetService.java index e7f59e9d22..d467e4d776 100644 --- a/source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetService.java +++ b/source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetService.java @@ -115,8 +115,9 @@ public interface SolrFacetService /** * This method offers a convenient access point for getting all Facetable - * content properties defined on the specified content class (type or aspect). + * content properties defined on the specified content class (type or aspect) or any of its inherited properties. * @param contentClass the QName of an aspect or type, whose facetable properties are sought. + * @param includeInheritedProperties {@code true} to include properties defined on supertypes. * @return a collection of facetable {@link PropertyDefinition}s. * @see Facetable */