From d579f0e1c25b470dcad335363da746d8ba51cd9d Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 11 Nov 2013 15:28:35 -0500 Subject: [PATCH] editLink macro was referencing displayNames rather than rangeURIs --- .../templates/freemarker/lib/lib-properties.ftl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/webapp/web/templates/freemarker/lib/lib-properties.ftl b/webapp/web/templates/freemarker/lib/lib-properties.ftl index d5b5ec9c2..efb98f2a8 100644 --- a/webapp/web/templates/freemarker/lib/lib-properties.ftl +++ b/webapp/web/templates/freemarker/lib/lib-properties.ftl @@ -171,22 +171,22 @@ name will be used as the label. --> <#macro editingLinks propertyLocalName propertyName statement editable rangeUri=""> <#if editable > <#if (!rangeUri?contains("Authorship") && !rangeUri?contains("URL") && !rangeUri?contains("Editorship") && propertyLocalName != "hasResearchArea")> - <@editLink propertyLocalName propertyName statement /> + <@editLink propertyLocalName propertyName statement rangeUri/> <@deleteLink propertyLocalName propertyName statement /> -<#macro editLink propertyLocalName propertyName statement> +<#macro editLink propertyLocalName propertyName statement rangeUri=""> <#if propertyLocalName?contains("ARG_2000028")> - <#if propertyName?contains("mailing address")> + <#if rangeUri?contains("Address")> <#local url = statement.editUrl + "&addressUri=" + "${statement.address!}"> - <#elseif propertyName?contains("phone") || propertyName?contains("fax")> + <#elseif rangeUri?contains("Telephone") || rangeUri?contains("Fax")> <#local url = statement.editUrl + "&phoneUri=" + "${statement.phone!}"> - <#elseif propertyName?contains("primary email") || propertyName?contains("additional emails")> + <#elseif rangeUri?contains("Work") || rangeUri?contains("Email")> <#local url = statement.editUrl + "&emailUri=" + "${statement.email!}"> - <#elseif propertyName?contains("full name")> + <#elseif rangeUri?contains("Name")> <#local url = statement.editUrl + "&fullNameUri=" + "${statement.fullName!}"> - <#elseif propertyName?contains("preferred title")> + <#elseif rangeUri?contains("Title")> <#local url = statement.editUrl + "&titleUri=" + "${statement.title!}"> <#else>