From 86baca768e91b38703b6e805545dbe402e113799 Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Thu, 9 Jun 2016 15:00:06 +0000 Subject: [PATCH] Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 128045 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 127999 rneamtu: Merged DEV to 5.0.N (5.0.4) 127518 rneamtu: MNT-15457 : Can not define site filter via solr-facets-config-custom.properties file - Set qname for SITE special facetable property git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128093 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/scripts/facet/FacetablePropertiesGet.java | 3 ++- .../web/scripts/facet/FacetablePropertyFTL.java | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java b/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java index b774ea19ba..000d221671 100644 --- a/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java +++ b/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java @@ -37,6 +37,7 @@ import java.util.TreeSet; import org.alfresco.repo.i18n.StaticMessageLookup; import org.alfresco.repo.search.impl.solr.facet.SolrFacetService.SyntheticPropertyDefinition; +import org.alfresco.repo.site.SiteModel; import org.alfresco.repo.web.scripts.facet.FacetablePropertyFTL.FacetablePropertyFTLComparator; import org.alfresco.repo.web.scripts.facet.FacetablePropertyFTL.SpecialFacetablePropertyFTL; import org.alfresco.repo.web.scripts.facet.FacetablePropertyFTL.StandardFacetablePropertyFTL; @@ -130,7 +131,7 @@ public class FacetablePropertiesGet extends AbstractSolrFacetConfigAdminWebScrip // Always add some hard-coded facetable "properties" facetableProperties.add(new SpecialFacetablePropertyFTL("TAG", "Tag")); - facetableProperties.add(new SpecialFacetablePropertyFTL("SITE", "Site")); + facetableProperties.add(new SpecialFacetablePropertyFTL("SITE", "Site", SiteModel.TYPE_SITE)); // The webscript allows for some further filtering of results: List filters = new ArrayList<>(); diff --git a/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertyFTL.java b/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertyFTL.java index ce254c18e5..7f9bc8a4fa 100644 --- a/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertyFTL.java +++ b/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertyFTL.java @@ -280,6 +280,8 @@ public abstract class FacetablePropertyFTL implements Comparable private final String displayName; + private final QName qName; + /** * @param localisedTitle The localised title of this synthetic property e.g. "taille". */ @@ -288,17 +290,25 @@ public abstract class FacetablePropertyFTL implements Comparable super(localisedTitle); this.name = name; this.displayName = localisedTitle; + this.qName = null; + } + public SpecialFacetablePropertyFTL(String name, String localisedTitle, QName qName) + { + super(localisedTitle); + this.name = name; + this.displayName = localisedTitle; + this.qName = qName; } @Override public String getShortQname() { return name; } - @Override public QName getQname() { return null; } + @Override public QName getQname() { return qName; } @Override public QName getDataType() { return null; } @Override public QName getContainerClassType() { return null; } - @Override public QName getModelQname() { return null; } + @Override public QName getModelQname() { return qName; } @Override public String getDisplayName() { return displayName; }