From bf537da56dec96aa6b6376c496966c260708665d Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Sat, 20 Sep 2014 09:20:22 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 84941: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 83559: Adding long-form QName into JSON rsp, as requested. Part of ACE-2639. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85258 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repository/facet/facetable-properties.get.desc.xml | 2 ++ .../alfresco/repository/facet/facetable-properties.get.json.ftl | 1 + 2 files changed, 3 insertions(+) diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.desc.xml index a983d9369f..6c885cbd16 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.desc.xml +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.desc.xml @@ -14,12 +14,14 @@ "properties" : [ { "name" : "eg:propName1", + "longqname" : "{http://www.alfresco.org/model/example/1.0}propName1", "displayName" : "eg:propName1", "dataType" : "d:text", "modelQName" : "eg:examplemodel" }, { "name" : "eg:propName2", + "longqname" : "{http://www.alfresco.org/model/example/1.0}propName2", "title" : "Useful Metadata", "displayName" : "eg:propName2 (Useful Metadata)", "dataType" : "d:text", 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 a370d03f08..7b03f6c83b 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 @@ -5,6 +5,7 @@ <#list properties as property> { "name" : "${property.propertyDefinition.name.prefixString}", + "longqname" : "${property.propertyDefinition.name?string}", <#if property.localisedTitle??> "title" : "${property.localisedTitle}",