From 9abe30d450ca8b4c4ae45e56257252646465a6b4 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Sat, 20 Sep 2014 09:08:52 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    84917:
 Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)       83444:
 ACE-2639. Added property title (where available) to JSON rsp.       As the
 title can only be retrieved using a getTitle(MessageLookup) call, I had to
 get the titles from the Java layer, rather than a straight get call in the
 FTL. Makes the API a bit messier. I may get to tidy it as part of ongoing
 work on ACE-2639.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85235 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repository/facet/facetable-properties.get.json.ftl   | 9 ++++++---
 .../repo/web/scripts/facet/FacetablePropertiesGet.java   | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.json.ftl
index 671386a576..5beb91fa53 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.json.ftl
@@ -2,9 +2,12 @@
 {
     "properties" : {
         <#list properties as property>
-        "${property.name}" : {
-             "modelQName" : "${property.model.name.prefixString}",
-             "dataType" : "${property.dataType.name.prefixString}"
+        "${property.second.name.prefixString}" : {
+             <#if property.first??>
+             "title" : "${property.first}",
+             </#if>
+             "dataType" : "${property.second.dataType.name.prefixString}",
+             "modelQName" : "${property.second.model.name.prefixString}"
         }<#if property_has_next>,</#if>
         </#list>
     }
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 e97ecb27e3..1d693e65c8 100644
--- a/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java
@@ -27,6 +27,7 @@ import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.service.namespace.NamespaceException;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.extensions.webscripts.Cache;
@@ -72,7 +73,7 @@ public class FacetablePropertiesGet extends AbstractSolrFacetConfigAdminWebScrip
         
         final Map<String, Object> model = new HashMap<>();
         
-        final Set<PropertyDefinition> facetableProperties;
+        final Set<Pair<String, PropertyDefinition>> facetableProperties;
         if (contentClassQName == null)
         {
             facetableProperties = facetService.getFacetableProperties();