From 9f21c8c976d27ec967a3d03d75c8256e61da7ed5 Mon Sep 17 00:00:00 2001 From: Tim Worrall Date: Fri, 29 Apr 2016 13:01:35 -0400 Subject: [PATCH] Update level on ARG_0000028 faux properties was not working correctly due to a bug in the edit link macro. --- .../freemarker/lib/lib-properties.ftl | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl index 8c96bc2bf..ab06eaf47 100644 --- a/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl +++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl @@ -177,25 +177,23 @@ name will be used as the label. --> <#macro editLink propertyLocalName propertyName statement rangeUri=""> -<#if propertyLocalName?contains("ARG_2000028")> - <#if rangeUri?contains("Address")> - <#local url = statement.editUrl + "&addressUri=" + "${statement.address!}"> - <#elseif rangeUri?contains("Telephone") || rangeUri?contains("Fax")> - <#local url = statement.editUrl + "&phoneUri=" + "${statement.phone!}"> - <#elseif rangeUri?contains("Work") || rangeUri?contains("Email")> - <#local url = statement.editUrl + "&emailUri=" + "${statement.email!}"> - <#elseif rangeUri?contains("Name")> - <#local url = statement.editUrl + "&fullNameUri=" + "${statement.fullName!}"> - <#elseif rangeUri?contains("Title")> - <#local url = statement.editUrl + "&titleUri=" + "${statement.title!}"> - -<#else> - <#local url = statement.editUrl> - - <#if url?has_content> + <#local url = statement.editUrl> + <#if url?has_content> + <#if propertyLocalName?contains("ARG_2000028")> + <#if rangeUri?contains("Address")> + <#local url = url + "&addressUri=" + "${statement.address!}"> + <#elseif rangeUri?contains("Telephone") || rangeUri?contains("Fax")> + <#local url = url + "&phoneUri=" + "${statement.phone!}"> + <#elseif rangeUri?contains("Work") || rangeUri?contains("Email")> + <#local url = url + "&emailUri=" + "${statement.email!}"> + <#elseif rangeUri?contains("Name")> + <#local url = url + "&fullNameUri=" + "${statement.fullName!}"> + <#elseif rangeUri?contains("Title")> + <#local url = url + "&titleUri=" + "${statement.title!}"> + + <@showEditLink propertyLocalName url /> - <#macro showEditLink propertyLocalName url>