Index: client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java (revision 52760) +++ client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java (revision ) @@ -44,6 +44,7 @@ import org.hippoecm.hst.core.parameters.ParametersInfo; import org.hippoecm.hst.pagecomposer.jaxrs.api.PropertyRepresentationFactory; import org.hippoecm.hst.pagecomposer.jaxrs.services.helpers.ContainerItemHelper; +import org.hippoecm.hst.pagecomposer.jaxrs.util.DocumentUtils; import org.hippoecm.hst.pagecomposer.jaxrs.util.HstComponentParameters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -78,7 +79,7 @@ HstComponentParameters componentParameters = new HstComponentParameters(containerItemNode, containerItemHelper); - setValueForProperties(properties, prefix, componentParameters); + setValueForProperties(properties, prefix, componentParameters, contentPath); if (propertyPresentationFactories != null) { int index = 0; @@ -105,21 +106,27 @@ public static void setValueForProperties(final List properties, final String prefix, - final HstComponentParameters componentParameters) { + final HstComponentParameters componentParameters, String contentPath) { for (ContainerItemComponentPropertyRepresentation prop : properties) { - setValueForProperty(prop, prefix, componentParameters); + setValueForProperty(prop, prefix, componentParameters, contentPath); } } public static void setValueForProperty(final ContainerItemComponentPropertyRepresentation property, final String prefix, - final HstComponentParameters componentParameters) { + final HstComponentParameters componentParameters, String contentPath) { String value = componentParameters.getValue(prefix, property.getName()); if (value != null && !value.isEmpty()) { property.setValue(value); + if(property.getType().equals("linkpicker")) { + final DocumentRepresentation docRepresentation = DocumentUtils.getDocumentRepresentationHstConfigUser(value, contentPath); + final String displayName = docRepresentation.getDisplayName(); + if(displayName != null && !displayName.isEmpty()) { + property.setDisplayValue(displayName); - } - } + } + } - + } + } private static Map createPropertyMap(final String contentPath, final Class classType, final ResourceBundle[] resourceBundles) { // although below the classType.getMethods() returns methods in random order (not in jdk 6 but it does in jdk 7 which is according spec)