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

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
128093 arebegea: 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/HEAD/root@129267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 13:17:12 +00:00
parent 34476add50
commit 9d7fda1b38
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java
View File

@@ -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<ResultFilter> filters = new ArrayList<>();

14
source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertyFTL.java
View File

@@ -280,6 +280,8 @@ public abstract class FacetablePropertyFTL<T> implements Comparable<T>
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<T> implements Comparable<T>
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; }