From e8cc740c424a0deec88a7ea5b9c0839aa1614460 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Sat, 20 Sep 2014 10:31:41 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 85042: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 84307: Fixes to ACE-2639. The long-form QName for synthetic properties should be like {http:\/\/www.alfresco.org\/model\/content\/1.0}content.size git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85357 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/scripts/facet/FacetablePropertiesGet.java | 15 ++++++++++++--- 1 file changed, 12 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 201148cccb..42175fa818 100644 --- a/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java +++ b/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java @@ -356,9 +356,18 @@ public class FacetablePropertiesGet extends AbstractSolrFacetConfigAdminWebScrip this.displayName = getShortQname() + (localisedTitle == null ? "" : " (" + localisedTitle + ")"); } - @Override public String getShortQname() { return super.getShortQname() + - "." + this.syntheticPropertyName; } + @Override public String getShortQname() + { + return super.getShortQname() + "." + this.syntheticPropertyName; + } - @Override public QName getDataType() { return datatype; } + @Override public QName getQname() + { + final QName containingPropQName = super.getQname(); + return QName.createQName(containingPropQName.getNamespaceURI(), + containingPropQName.getLocalName() + "." + this.syntheticPropertyName); + } + + @Override public QName getDataType() { return datatype; } } }